Skip to content

Rollup of 5 pull requests - #73276

Merged
bors merged 12 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-hfd81qw
Jun 12, 2020
Merged

Rollup of 5 pull requests#73276
bors merged 12 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-hfd81qw

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

petrochenkovand others added 12 commits June 9, 2020 22:27
…, r=dtolnay
Migrate to numeric associated consts
The deprecation PR is rust-lang#72885
cc rust-lang#68490
cc rust-lang/rfcs#2700
expand: More precise locations for expansion-time lints
First commit: a macro expansion doesn't have a `NodeId` associated with it, but it has a parent `DefId` which we can use for linting.
The observable effect is that lints associated with macro expansions can now be `allow`ed at finer-grained level than whole crate.
Second commit: each macro definition has a `NodeId` which we can use for linting, unless that macro definition was decoded from other crate.
Allow inference regions when relating consts
As first noticed by @eddyb, `super_relate_consts` doesn't need to check for inference vars since `eval` does it already (and handles lifetimes correctly by erasing them).
Fixesrust-lang#73050
r? @oli-obk
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=5

@bors

bors commented Jun 12, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 77ede48 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 12, 2020
@bors

bors commented Jun 12, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 77ede48 with merge 7c78a5f...

@bors

bors commented Jun 12, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 7c78a5f to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 12, 2020
@bors
bors merged commit 7c78a5f into rust-lang:masterJun 12, 2020
@cuvipercuviper added this to the 1.46 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@Dylan-DPC-zz@bors@cuviper@petrochenkov@tesuji@tmandry@GuillaumeGomez@LeSeulArtichaut@Dylan-DPC