bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use right span in prelude collision suggestions with macros.

Browse source
This commit is contained in:
Mara Bos 2021-08-30 20:34:26 +02:00
parent 2a06daa863
commit a15dab9ce2
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
compiler/rustc_typeck/src/check/method/prelude2021.rs
View file

@ -156,15 +156,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
segment.ident.name segment.ident.name
)); ));
let (self_adjusted, precise) = self.adjust_expr(pick, self_expr); let (self_adjusted, precise) = self.adjust_expr(pick, self_expr, sp);
if precise { if precise {
let args = args let args = args
.iter() .iter()
.skip(1) .skip(1)
.map(|arg| { .map(|arg| {
let span = arg.span.find_ancestor_inside(sp).unwrap_or_default();
format!( format!(
", {}", ", {}",
self.sess().source_map().span_to_snippet(arg.span).unwrap() self.sess().source_map().span_to_snippet(span).unwrap()
) )
}) })
.collect::<String>(); .collect::<String>();
@ -275,7 +276,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let mut self_ty_name = self let mut self_ty_name = self
.sess() .sess()
.source_map() .source_map()
.span_to_snippet(self_ty_span) .span_to_snippet(self_ty_span.find_ancestor_inside(span).unwrap_or_default())
.unwrap_or_else(|_| self_ty.to_string()); .unwrap_or_else(|_| self_ty.to_string());
// Get the number of generics the self type has (if an Adt) unless we can determine that // Get the number of generics the self type has (if an Adt) unless we can determine that
@ -370,7 +371,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
/// Creates a string version of the `expr` that includes explicit adjustments. /// Creates a string version of the `expr` that includes explicit adjustments.
/// Returns the string and also a bool indicating whther this is a *precise* /// Returns the string and also a bool indicating whther this is a *precise*
/// suggestion. /// suggestion.
fn adjust_expr(&self, pick: &Pick<'tcx>, expr: &hir::Expr<'tcx>) -> (String, bool) { fn adjust_expr(
&self,
pick: &Pick<'tcx>,
expr: &hir::Expr<'tcx>,
outer: Span,
) -> (String, bool) {
let derefs = "*".repeat(pick.autoderefs); let derefs = "*".repeat(pick.autoderefs);
let autoref = match pick.autoref_or_ptr_adjustment { let autoref = match pick.autoref_or_ptr_adjustment {
@ -379,12 +385,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
Some(probe::AutorefOrPtrAdjustment::ToConstPtr) | None => "", Some(probe::AutorefOrPtrAdjustment::ToConstPtr) | None => "",
}; };
let (expr_text, precise) = let (expr_text, precise) = if let Ok(expr_text) = self
if let Ok(expr_text) = self.sess().source_map().span_to_snippet(expr.span) { .sess()
(expr_text, true) .source_map()
} else { .span_to_snippet(expr.span.find_ancestor_inside(outer).unwrap_or_default())
("(..)".to_string(), false) {
}; (expr_text, true)
} else {
("(..)".to_string(), false)
};
let adjusted_text = if let Some(probe::AutorefOrPtrAdjustment::ToConstPtr) = let adjusted_text = if let Some(probe::AutorefOrPtrAdjustment::ToConstPtr) =
pick.autoref_or_ptr_adjustment pick.autoref_or_ptr_adjustment