Rollup merge of rust-lang#70798 - estebank:satisfy, r=Centril

Centril · web-flow · commit e1b380a675d5 · 2020-04-06T00:53:48.000+02:00
"cannot resolve" → "cannot satisfy" CC rust-lang#66523 r? @Centril
diff --git a/src/librustc_trait_selection/traits/error_reporting/mod.rs b/src/librustc_trait_selection/traits/error_reporting/mod.rs
@@ -1377,7 +1377,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'tcx> for InferCtxt<'a, 'tcx> {
                     return;
                 }
                 let mut err = self.need_type_info_err(body_id, span, self_ty, ErrorCode::E0283);
-                err.note(&format!("cannot resolve `{}`", predicate));
+                err.note(&format!("cannot satisfy `{}`", predicate));
                 if let ObligationCauseCode::ItemObligation(def_id) = obligation.cause.code {
                     self.suggest_fully_qualified_path(&mut err, def_id, span, trait_ref.def_id());
                 } else if let (
@@ -1407,7 +1407,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'tcx> for InferCtxt<'a, 'tcx> {
                         // LL |     const fn const_val<T: Sized>() -> usize {
                         //    |              --------- - required by this bound in `Tt::const_val`
                         //    |
-                        //    = note: cannot resolve `_: Tt`
+                        //    = note: cannot satisfy `_: Tt`
 
                         err.span_suggestion_verbose(
                             span.shrink_to_hi(),
@@ -1457,7 +1457,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'tcx> for InferCtxt<'a, 'tcx> {
                     return;
                 }
                 let mut err = self.need_type_info_err(body_id, span, self_ty, ErrorCode::E0284);
-                err.note(&format!("cannot resolve `{}`", predicate));
+                err.note(&format!("cannot satisfy `{}`", predicate));
                 err
             }
 
@@ -1469,10 +1469,10 @@ impl<'a, 'tcx> InferCtxtPrivExt<'tcx> for InferCtxt<'a, 'tcx> {
                     self.tcx.sess,
                     span,
                     E0284,
-                    "type annotations needed: cannot resolve `{}`",
+                    "type annotations needed: cannot satisfy `{}`",
                     predicate,
                 );
-                err.span_label(span, &format!("cannot resolve `{}`", predicate));
+                err.span_label(span, &format!("cannot satisfy `{}`", predicate));
                 err
             }
         };
diff --git a/src/test/ui/associated-const/issue-63496.stderr b/src/test/ui/associated-const/issue-63496.stderr
@@ -10,7 +10,7 @@ LL |     fn f() -> ([u8; A::C], [u8; A::C]);
    |                     cannot infer type
    |                     help: use the fully qualified path to an implementation: `<Type as A>::C`
    |
-   = note: cannot resolve `_: A`
+   = note: cannot satisfy `_: A`
    = note: associated constants cannot be accessed directly on a `trait`, they can only be accessed through a specific `impl`
 
 error[E0283]: type annotations needed
@@ -25,7 +25,7 @@ LL |     fn f() -> ([u8; A::C], [u8; A::C]);
    |                                 cannot infer type
    |                                 help: use the fully qualified path to an implementation: `<Type as A>::C`
    |
-   = note: cannot resolve `_: A`
+   = note: cannot satisfy `_: A`
    = note: associated constants cannot be accessed directly on a `trait`, they can only be accessed through a specific `impl`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/associated-item/issue-48027.stderr b/src/test/ui/associated-item/issue-48027.stderr
@@ -22,7 +22,7 @@ LL |     fn return_n(&self) -> [u8; Bar::X];
    |                                cannot infer type
    |                                help: use the fully qualified path to an implementation: `<Type as Bar>::X`
    |
-   = note: cannot resolve `_: Bar`
+   = note: cannot satisfy `_: Bar`
    = note: associated constants cannot be accessed directly on a `trait`, they can only be accessed through a specific `impl`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/associated-types/associated-types-overridden-binding.stderr b/src/test/ui/associated-types/associated-types-overridden-binding.stderr
@@ -6,7 +6,7 @@ LL | trait Foo: Iterator<Item = i32> {}
 LL | trait Bar: Foo<Item = u32> {}
    |            ^^^^^^^^^^^^^^^ cannot infer type for type parameter `Self`
    |
-   = note: cannot resolve `<Self as std::iter::Iterator>::Item == i32`
+   = note: cannot satisfy `<Self as std::iter::Iterator>::Item == i32`
 
 error[E0284]: type annotations needed
   --> $DIR/associated-types-overridden-binding.rs:7:21
@@ -16,7 +16,7 @@ LL | trait I32Iterator = Iterator<Item = i32>;
 LL | trait U32Iterator = I32Iterator<Item = u32>;
    |                     ^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `Self`
    |
-   = note: cannot resolve `<Self as std::iter::Iterator>::Item == i32`
+   = note: cannot satisfy `<Self as std::iter::Iterator>::Item == i32`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/associated-types/associated-types-unconstrained.stderr b/src/test/ui/associated-types/associated-types-unconstrained.stderr
@@ -4,7 +4,7 @@ error[E0284]: type annotations needed
 LL |     let x: isize = Foo::bar();
    |                    ^^^^^^^^ cannot infer type
    |
-   = note: cannot resolve `<_ as Foo>::A == _`
+   = note: cannot satisfy `<_ as Foo>::A == _`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0283.stderr b/src/test/ui/error-codes/E0283.stderr
@@ -7,7 +7,7 @@ LL |     fn create() -> u32;
 LL |     let cont: u32 = Generator::create();
    |                     ^^^^^^^^^^^^^^^^^ cannot infer type
    |
-   = note: cannot resolve `_: Generator`
+   = note: cannot satisfy `_: Generator`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-12028.stderr b/src/test/ui/issues/issue-12028.stderr
@@ -4,7 +4,7 @@ error[E0284]: type annotations needed
 LL |         self.input_stream(&mut stream);
    |              ^^^^^^^^^^^^ cannot infer type for type parameter `H` declared on the trait `StreamHash`
    |
-   = note: cannot resolve `<_ as StreamHasher>::S == <H as StreamHasher>::S`
+   = note: cannot satisfy `<_ as StreamHasher>::S == <H as StreamHasher>::S`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-21974.stderr b/src/test/ui/issues/issue-21974.stderr
@@ -7,7 +7,7 @@ LL | trait Foo {
 LL |     where &'a T : Foo,
    |                   ^^^ cannot infer type for reference `&'a T`
    |
-   = note: cannot resolve `&'a T: Foo`
+   = note: cannot satisfy `&'a T: Foo`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-24424.stderr b/src/test/ui/issues/issue-24424.stderr
@@ -7,7 +7,7 @@ LL |
 LL | impl <'l0, 'l1, T0> Trait1<'l0, T0> for bool where T0 : Trait0<'l0>, T0 : Trait0<'l1> {}
    |                                                         ^^^^^^^^^^^ cannot infer type for type parameter `T0`
    |
-   = note: cannot resolve `T0: Trait0<'l0>`
+   = note: cannot satisfy `T0: Trait0<'l0>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-29147.stderr b/src/test/ui/issues/issue-29147.stderr
@@ -7,7 +7,7 @@ LL | trait Foo { fn xxx(&self); }
 LL |     let _ = <S5<_>>::xxx;
    |             ^^^^^^^^^^^^ cannot infer type for struct `S5<_>`
    |
-   = note: cannot resolve `S5<_>: Foo`
+   = note: cannot satisfy `S5<_>: Foo`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-54954.stderr b/src/test/ui/issues/issue-54954.stderr
@@ -13,7 +13,7 @@ LL | const ARR_LEN: usize = Tt::const_val::<[i8; 123]>();
 LL |     const fn const_val<T: Sized>() -> usize {
    |              --------- - required by this bound in `Tt::const_val`
    |
-   = note: cannot resolve `_: Tt`
+   = note: cannot satisfy `_: Tt`
 
 error[E0080]: evaluation of constant value failed
   --> $DIR/issue-54954.rs:13:15
diff --git a/src/test/ui/issues/issue-58022.stderr b/src/test/ui/issues/issue-58022.stderr
@@ -16,7 +16,7 @@ LL |     fn new(slice: &[u8; Foo::SIZE]) -> Self;
    |                         cannot infer type
    |                         help: use the fully qualified path to an implementation: `<Type as Foo>::SIZE`
    |
-   = note: cannot resolve `_: Foo`
+   = note: cannot satisfy `_: Foo`
    = note: associated constants cannot be accessed directly on a `trait`, they can only be accessed through a specific `impl`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/question-mark-type-infer.stderr b/src/test/ui/question-mark-type-infer.stderr
@@ -4,7 +4,7 @@ error[E0284]: type annotations needed
 LL |     l.iter().map(f).collect()?
    |                     ^^^^^^^ cannot infer type
    |
-   = note: cannot resolve `<_ as std::ops::Try>::Ok == _`
+   = note: cannot satisfy `<_ as std::ops::Try>::Ok == _`
 help: consider specifying the type argument in the method call
    |
 LL |     l.iter().map(f).collect::<B>()?
diff --git a/src/test/ui/traits/trait-static-method-generic-inference.stderr b/src/test/ui/traits/trait-static-method-generic-inference.stderr
@@ -7,7 +7,7 @@ LL |         fn new() -> T;
 LL |     let _f: base::Foo = base::HasNew::new();
    |                         ^^^^^^^^^^^^^^^^^ cannot infer type
    |
-   = note: cannot resolve `_: base::HasNew<base::Foo>`
+   = note: cannot satisfy `_: base::HasNew<base::Foo>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/type/type-annotation-needed.rs b/src/test/ui/type/type-annotation-needed.rs
@@ -6,5 +6,5 @@ fn main() {
     foo(42);
     //~^ ERROR type annotations needed
     //~| NOTE cannot infer type
-    //~| NOTE cannot resolve
+    //~| NOTE cannot satisfy
 }
diff --git a/src/test/ui/type/type-annotation-needed.stderr b/src/test/ui/type/type-annotation-needed.stderr
@@ -7,7 +7,7 @@ LL | fn foo<T: Into<String>>(x: i32) {}
 LL |     foo(42);
    |     ^^^ cannot infer type for type parameter `T` declared on the function `foo`
    |
-   = note: cannot resolve `_: std::convert::Into<std::string::String>`
+   = note: cannot satisfy `_: std::convert::Into<std::string::String>`
 help: consider specifying the type argument in the function call
    |
 LL |     foo::<T>(42);
diff --git a/src/test/ui/type/type-check/issue-40294.stderr b/src/test/ui/type/type-check/issue-40294.stderr
@@ -7,7 +7,7 @@ LL | trait Foo: Sized {
 LL |     where &'a T : Foo,
    |                   ^^^ cannot infer type for reference `&'a T`
    |
-   = note: cannot resolve `&'a T: Foo`
+   = note: cannot satisfy `&'a T: Foo`
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ LL \| fn return_n(&self) -> [u8; Bar::X];`
`22`	`22`	`\| cannot infer type`
`23`	`23`	\| help: use the fully qualified path to an implementation: `<Type as Bar>::X`
`24`	`24`	`\|`
`25`		- = note: cannot resolve `_: Bar`
	`25`	+ = note: cannot satisfy `_: Bar`
`26`	`26`	= note: associated constants cannot be accessed directly on a `trait`, they can only be accessed through a specific `impl`
`27`	`27`
`28`	`28`	`error: aborting due to 2 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| trait Foo: Iterator<Item = i32> {}`
`6`	`6`	`LL \| trait Bar: Foo<Item = u32> {}`
`7`	`7`	\| ^^^^^^^^^^^^^^^ cannot infer type for type parameter `Self`
`8`	`8`	`\|`
`9`		- = note: cannot resolve `<Self as std::iter::Iterator>::Item == i32`
	`9`	+ = note: cannot satisfy `<Self as std::iter::Iterator>::Item == i32`
`10`	`10`
`11`	`11`	`error[E0284]: type annotations needed`
`12`	`12`	`--> $DIR/associated-types-overridden-binding.rs:7:21`
`@@ -16,7 +16,7 @@ LL \| trait I32Iterator = Iterator<Item = i32>;`
`16`	`16`	`LL \| trait U32Iterator = I32Iterator<Item = u32>;`
`17`	`17`	\| ^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `Self`
`18`	`18`	`\|`
`19`		- = note: cannot resolve `<Self as std::iter::Iterator>::Item == i32`
	`19`	+ = note: cannot satisfy `<Self as std::iter::Iterator>::Item == i32`
`20`	`20`
`21`	`21`	`error: aborting due to 2 previous errors`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error[E0284]: type annotations needed`
`4`	`4`	`LL \| let x: isize = Foo::bar();`
`5`	`5`	`\| ^^^^^^^^ cannot infer type`
`6`	`6`	`\|`
`7`		- = note: cannot resolve `<_ as Foo>::A == _`
	`7`	+ = note: cannot satisfy `<_ as Foo>::A == _`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| fn create() -> u32;`
`7`	`7`	`LL \| let cont: u32 = Generator::create();`
`8`	`8`	`\| ^^^^^^^^^^^^^^^^^ cannot infer type`
`9`	`9`	`\|`
`10`		- = note: cannot resolve `_: Generator`
	`10`	+ = note: cannot satisfy `_: Generator`
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error[E0284]: type annotations needed`
`4`	`4`	`LL \| self.input_stream(&mut stream);`
`5`	`5`	\| ^^^^^^^^^^^^ cannot infer type for type parameter `H` declared on the trait `StreamHash`
`6`	`6`	`\|`
`7`		- = note: cannot resolve `<_ as StreamHasher>::S == <H as StreamHasher>::S`
	`7`	+ = note: cannot satisfy `<_ as StreamHasher>::S == <H as StreamHasher>::S`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| trait Foo {`
`7`	`7`	`LL \| where &'a T : Foo,`
`8`	`8`	\| ^^^ cannot infer type for reference `&'a T`
`9`	`9`	`\|`
`10`		- = note: cannot resolve `&'a T: Foo`
	`10`	+ = note: cannot satisfy `&'a T: Foo`
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \|`
`7`	`7`	`LL \| impl <'l0, 'l1, T0> Trait1<'l0, T0> for bool where T0 : Trait0<'l0>, T0 : Trait0<'l1> {}`
`8`	`8`	\| ^^^^^^^^^^^ cannot infer type for type parameter `T0`
`9`	`9`	`\|`
`10`		- = note: cannot resolve `T0: Trait0<'l0>`
	`10`	+ = note: cannot satisfy `T0: Trait0<'l0>`
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| trait Foo { fn xxx(&self); }`
`7`	`7`	`LL \| let _ = <S5<_>>::xxx;`
`8`	`8`	\| ^^^^^^^^^^^^ cannot infer type for struct `S5<_>`
`9`	`9`	`\|`
`10`		- = note: cannot resolve `S5<_>: Foo`
	`10`	+ = note: cannot satisfy `S5<_>: Foo`
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`