Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep turbofish in prelude collision lint. #88504

Merged
merged 2 commits into from
Aug 31, 2021
Merged

Keep turbofish in prelude collision lint. #88504

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4986bbf
Keep turbofish in prelude collision lint.
m-ou-se Aug 30, 2021
532be28
Test that turbofish does not swim away in prelude collusion suggestion.
m-ou-se Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Keep turbofish in prelude collision lint.
  • Loading branch information
@m-ou-se
m-ou-se committed Aug 30, 2021
commit 4986bbf135d477f73af96ef235407921ce952dc0
18 changes: 16 additions & 2 deletions compiler/rustc_typeck/src/check/method/prelude2021.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,22 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
sp,
"disambiguate the associated function",
format!(
"{}::{}({}{})",
trait_name, segment.ident.name, self_adjusted, args
"{}::{}{}({}{})",
trait_name,
segment.ident.name,
if let Some(args) = segment.args.as_ref().and_then(|args| self
.sess()
.source_map()
.span_to_snippet(args.span_ext)
.ok())
{
// Keep turbofish.
format!("::{}", args)
} else {
String::new()
},
self_adjusted,
args,
),
Applicability::MachineApplicable,
);
Expand Down