Skip to content

Keep turbofish in prelude collision lint. - #88504

Merged
bors merged 2 commits into
rust-lang:masterfrom
m-ou-se:turbofish-please-stay
Aug 31, 2021
Merged

Keep turbofish in prelude collision lint.#88504
bors merged 2 commits into
rust-lang:masterfrom
m-ou-se:turbofish-please-stay

Conversation

@m-ou-se

Copy link
Copy Markdown
Member

Fixes#88442

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 30, 2021
@m-ou-sem-ou-se added A-edition-2021 Area: The 2021 edition A-suggestion-diagnostics Area: Suggestions generated by the compiler applied by `cargo fix` D-invalid-suggestion Diagnostics: A structured suggestion resulting in incorrect code. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 30, 2021
@oli-obk

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Aug 31, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 532be28 has been approved by oli-obk

@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
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2021
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 13f6d7e 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

Labels

A-edition-2021Area: The 2021 editionA-suggestion-diagnosticsArea: Suggestions generated by the compiler applied by `cargo fix`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

Development

Successfully merging this pull request may close these issues.

rust_2021_prelude_collisions suggestions cause compile error with generics

5 participants

@m-ou-se@rust-highfive@oli-obk@bors@rustbot