Skip to content

Use right span in prelude collision suggestions with macros. - #88501

Merged
bors merged 4 commits into
rust-lang:masterfrom
m-ou-se:prelude-collusion-oh-no-macros-help
Aug 31, 2021
Merged

Use right span in prelude collision suggestions with macros. #88501
bors merged 4 commits into
rust-lang:masterfrom
m-ou-se:prelude-collusion-oh-no-macros-help

Conversation

@m-ou-se

@m-ou-sem-ou-se commented Aug 30, 2021

Copy link
Copy Markdown
Member

@m-ou-sem-ou-se added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. C-bug Category: This is a bug. A-suggestion-diagnostics Area: Suggestions generated by the compiler applied by `cargo fix` D-invalid-suggestion Diagnostics: A structured suggestion resulting in incorrect code. A-edition-2021 Area: The 2021 edition labels Aug 30, 2021
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 30, 2021
estebank
estebank reviewed Aug 31, 2021
View reviewed changes
Comment threadcompiler/rustc_typeck/src/check/method/prelude2021.rs Outdated
estebank
estebank reviewed Aug 31, 2021
View reviewed changes
Comment threadcompiler/rustc_typeck/src/check/method/prelude2021.rs Outdated
estebank
estebank approved these changes Aug 31, 2021
View reviewed changes

@estebankestebank left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with the current changes after confirming that unwrap_default() is the correct code we want to use there.

@m-ou-se
m-ou-seforce-pushed the prelude-collusion-oh-no-macros-help branch from ddad7ad to 7c0479bCompareAugust 31, 2021 14:30
@m-ou-se

m-ou-se commented Aug 31, 2021

Copy link
Copy Markdown
MemberAuthor

@bors r=estebank

@bors

bors commented Aug 31, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 7c0479b has been approved by estebank

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 31, 2021
@m-ou-sem-ou-se mentioned this pull request Aug 31, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2021
@bors
Auto merge ofrust-lang#88535- m-ou-se:rollup-jeusxbo, r=m-ou-se
0a84708
Rollup of 10 pull requests
Successful merges:
- rust-lang#85017 (Add carrying_add, borrowing_sub, widening_mul, carrying_mul methods to integers)
- rust-lang#86362 (Avoid cloning LocalDecls)
- rust-lang#88391 (Fix json tuple struct enum variant )
- rust-lang#88399 (Disallow the aapcs CC on Aarch64)
- rust-lang#88418 (Allow `~const` bounds on trait assoc functions)
- rust-lang#88445 (Clean up the lowering of AST items)
- rust-lang#88495 (Add `TcpStream::set_linger` and `TcpStream::linger`)
- rust-lang#88501 (Use right span in prelude collision suggestions with macros. )
- rust-lang#88504 (Keep turbofish in prelude collision lint.)
- rust-lang#88524 (Remove unnecessary `mut` from udp doctests)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 91c4fee into rust-lang:masterAug 31, 2021
@rustbotrustbot added this to the 1.56.0 milestone Aug 31, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estebankestebankestebank approved these changes

Assignees

@estebankestebank

Labels

A-edition-2021Area: The 2021 editionA-suggestion-diagnosticsArea: Suggestions generated by the compiler applied by `cargo fix`C-bugCategory: This is a bug.D-invalid-suggestionDiagnostics: A structured suggestion resulting in incorrect code.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.56.0

Development

Successfully merging this pull request may close these issues.

2021 prelude collision lint expands macros when used as an expression

5 participants

@m-ou-se@bors@estebank@rust-highfive@rustbot