rust-lang
diff --git a/‎compiler/rustc_hir_analysis/src/check/compare_impl_item.rs
+3-3 b/‎compiler/rustc_hir_analysis/src/check/compare_impl_item.rs
+3-3
diff --git a/‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
+1-1 b/‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
+1-1
diff --git a/‎compiler/rustc_hir_typeck/src/pat.rs
+1-1 b/‎compiler/rustc_hir_typeck/src/pat.rs
+1-1
diff --git a/‎library/core/src/lib.rs
+2 b/‎library/core/src/lib.rs
+2
@@ -981,7 +981,7 @@ fn report_trait_method_mismatch<'tcx>(
                 .next()
                 .unwrap_or(impl_err_span);
 
-            diag.span_suggestion(
+            diag.span_suggestion_verbose(
                 span,
                 "change the self-receiver type to match the trait",
                 sugg,
@@ -1005,12 +1005,12 @@ fn report_trait_method_mismatch<'tcx>(
                         }
                         hir::FnRetTy::Return(hir_ty) => {
                             let sugg = trait_sig.output();
-                            diag.span_suggestion(hir_ty.span, msg, sugg, ap);
+                            diag.span_suggestion_verbose(hir_ty.span, msg, sugg, ap);
                         }
                     };
                 };
             } else if let Some(trait_ty) = trait_sig.inputs().get(*i) {
-                diag.span_suggestion(
+                diag.span_suggestion_verbose(
                     impl_err_span,
                     "change the parameter type to match the trait",
                     trait_ty,
 
@@ -1384,7 +1384,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 Some(format!("provide the argument{}", if plural { "s" } else { "" }))
             }
             SuggestionText::Remove(plural) => {
-                err.multipart_suggestion(
+                err.multipart_suggestion_verbose(
                     format!("remove the extra argument{}", if plural { "s" } else { "" }),
                     suggestions,
                     Applicability::HasPlaceholders,
 
@@ -2217,7 +2217,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 debug!("check_pat_ref: expected={:?}", expected);
                 match *expected.kind() {
                     ty::Ref(_, r_ty, r_mutbl)
-                        if (new_match_ergonomics && r_mutbl >= pat_mutbl)
+                        if (no_ref_mut_behind_and && r_mutbl >= pat_mutbl)
                             || r_mutbl == pat_mutbl =>
                     {
                         if no_ref_mut_behind_and && r_mutbl == Mutability::Not {
 
@@ -395,6 +395,8 @@ pub mod panicking;
 #[unstable(feature = "core_pattern_types", issue = "none")]
 pub mod pat;
 pub mod pin;
+#[unstable(feature = "new_range_api", issue = "125687")]
+pub mod range;
 pub mod result;
 pub mod sync;
Original file line number	Diff line number	Diff line change
`@@ -1384,7 +1384,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`1384`	`1384`	`Some(format!("provide the argument{}", if plural { "s" } else { "" }))`
`1385`	`1385`	`}`
`1386`	`1386`	`SuggestionText::Remove(plural) => {`
`1387`		`- err.multipart_suggestion(`
	`1387`	`+ err.multipart_suggestion_verbose(`
`1388`	`1388`	`format!("remove the extra argument{}", if plural { "s" } else { "" }),`
`1389`	`1389`	`suggestions,`
`1390`	`1390`	`Applicability::HasPlaceholders,`
Original file line number	Diff line number	Diff line change
`@@ -2217,7 +2217,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`2217`	`2217`	`debug!("check_pat_ref: expected={:?}", expected);`
`2218`	`2218`	`match *expected.kind() {`
`2219`	`2219`	`ty::Ref(_, r_ty, r_mutbl)`
`2220`		`- if (new_match_ergonomics && r_mutbl >= pat_mutbl)`
	`2220`	`+ if (no_ref_mut_behind_and && r_mutbl >= pat_mutbl)`
`2221`	`2221`	`\|\| r_mutbl == pat_mutbl =>`
`2222`	`2222`	`{`
`2223`	`2223`	`if no_ref_mut_behind_and && r_mutbl == Mutability::Not {`