bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix autoderef and autoref for future_prelude_collision lint

Browse source
This commit is contained in:
jam1garner 2021-05-27 13:28:55 -04:00 • committed by Niko Matsakis
parent c41a157b90
commit 327697a540
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_typeck/src/check/method/mod.rs
View file

@ -11,6 +11,7 @@ pub use self::CandidateSource::*;
pub use self::MethodError::*; pub use self::MethodError::*;
use crate::check::FnCtxt; use crate::check::FnCtxt;
use rustc_ast::ast::Mutability;
use rustc_data_structures::sync::Lrc; use rustc_data_structures::sync::Lrc;
use rustc_errors::{Applicability, DiagnosticBuilder}; use rustc_errors::{Applicability, DiagnosticBuilder};
use rustc_hir as hir; use rustc_hir as hir;
@ -222,12 +223,23 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
if let Ok(self_expr) = if let Ok(self_expr) =
self.sess().source_map().span_to_snippet(self_expr.span) self.sess().source_map().span_to_snippet(self_expr.span)
{ {
let derefs = "*".repeat(pick.autoderefs);
let self_adjusted = match pick.autoref_or_ptr_adjustment {
Some(probe::AutorefOrPtrAdjustment::Autoref {
mutbl: Mutability::Mut, ..
}) => format!("&mut {}{}", derefs, self_expr),
Some(probe::AutorefOrPtrAdjustment::Autoref {
mutbl: Mutability::Not, ..
}) => format!("&{}{}", derefs, self_expr),
Some(probe::AutorefOrPtrAdjustment::ToConstPtr) | None
=> format!("{}{}", derefs, self_expr),
};
lint.span_suggestion( lint.span_suggestion(
sp, sp,
"disambiguate the associated function", "disambiguate the associated function",
format!( format!(
"{}::{}({})", "{}::{}({})",
trait_name, segment.ident.name, self_expr, trait_name, segment.ident.name, self_adjusted,
), ),
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );