Remove FullfillmentError::span method

Author: estebank

compiler/rustc_infer/src/traits/mod.rs

@@ -17,7 +17,7 @@ use rustc_middle::traits::query::NoSolution;
 use rustc_middle::traits::solve::Certainty;
 use rustc_middle::ty::error::{ExpectedFound, TypeError};
 use rustc_middle::ty::{self, Const, ToPredicate, Ty, TyCtxt};
-use rustc_span::{DesugaringKind, ExpnKind, Span};
+use rustc_span::Span;
 
 pub use self::ImplSource::*;
 pub use self::SelectionError::*;
@@ -206,19 +206,6 @@ impl<'tcx> FulfillmentError<'tcx> {
     ) -> FulfillmentError<'tcx> {
         FulfillmentError { obligation, code, root_obligation }
     }
-
-    pub fn span(&self) -> Span {
-        let mut span = self.obligation.cause.span;
-        // We want to ignore desugarings here: spans are equivalent even
-        // if one is the result of a desugaring and the other is not.
-        let expn_data = span.ctxt().outer_expn_data();
-        if let ExpnKind::Desugaring(desugaring) = expn_data.kind
-            && DesugaringKind::QuestionMark != desugaring
-        {
-            span = expn_data.call_site;
-        }
-        span
-    }
 }
 
 impl<'tcx> PolyTraitObligation<'tcx> {

compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs

@@ -125,7 +125,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
         });
 
         for (index, error) in errors.iter().enumerate() {
-            error_map.entry(error.span()).or_default().push(ErrorDescriptor {
+            error_map.entry(error.obligation.cause.span).or_default().push(ErrorDescriptor {
                 predicate: error.obligation.predicate,
                 index: Some(index),
             });
@@ -171,7 +171,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
                     reported = Some(guar);
                     self.reported_trait_errors
                         .borrow_mut()
-                        .entry(error.span())
+                        .entry(error.obligation.cause.span)
                         .or_insert_with(|| (vec![], guar))
                         .0
                         .push(error.obligation.predicate);
@@ -1489,7 +1489,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
                     error.obligation.clone(),
                     &error.root_obligation,
                     selection_error,
-                    error.span(),
+                    error.obligation.cause.span,
                 ),
             FulfillmentErrorCode::ProjectionError(ref e) => {
                 self.report_projection_error(&error.obligation, e)

tests/ui/coroutine/issue-88653.rs

@@ -6,11 +6,13 @@
 use std::ops::Coroutine;
 
 fn foo(bar: bool) -> impl Coroutine<(bool,)> {
-    //~^ ERROR: type mismatch in coroutine arguments [E0631]
-    //~| NOTE: expected due to this
-    //~| NOTE: expected coroutine signature `fn((bool,)) -> _`
+    //~^ ERROR type mismatch in coroutine arguments [E0631]
+    //~| NOTE expected due to this
+    //~| NOTE expected coroutine signature `fn((bool,)) -> _`
+    //~| NOTE in this expansion of desugaring of `impl Trait`
+    //~| NOTE in this expansion of desugaring of `impl Trait`
     |bar| {
-        //~^ NOTE: found signature defined here
+        //~^ NOTE found signature defined here
         if bar {
             yield bar;
         }

tests/ui/for/for-c-in-str.rs

@@ -6,6 +6,9 @@ fn main() {
         //~| NOTE `&str` is not an iterator
         //~| HELP the trait `Iterator` is not implemented for `&str`
         //~| NOTE required for `&str` to implement `IntoIterator`
+        //~| NOTE in this expansion of desugaring of `for` loop
+        //~| NOTE in this expansion of desugaring of `for` loop
+        //~| NOTE in this expansion of desugaring of `for` loop
         println!();
     }
 }

tests/ui/iterators/float_iterator_hint.rs

@@ -6,6 +6,10 @@ fn main() {
         //~| `{float}` is not an iterator
         //~| NOTE if you want to iterate between `start` until a value `end`, use the exclusive range syntax `start..end` or the inclusive range syntax `start..=end`
         //~| NOTE required for `{float}` to implement `IntoIterator`
+        //~| NOTE in this expansion of desugaring of `for` loop
+        //~| NOTE in this expansion of desugaring of `for` loop
+        //~| NOTE in this expansion of desugaring of `for` loop
+        //~| NOTE in this expansion of desugaring of `for` loop
         println!();
     }
 }

tests/ui/lifetimes/issue-76168-hr-outlives-3.stderr

@@ -33,7 +33,6 @@ LL | | for<'a> <i32 as FnOnce<(&'a mut i32,)>>::Output: Future<Output = ()> + 'a
    | |__________________________________________________________________________^ expected an `FnOnce(&'a mut i32)` closure, found `i32`
    |
    = help: the trait `for<'a> FnOnce<(&'a mut i32,)>` is not implemented for `i32`
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 
 error[E0277]: expected a `FnOnce(&'a mut i32)` closure, found `i32`
   --> $DIR/issue-76168-hr-outlives-3.rs:6:1