diff options
| author | Jack Huey <jack.huey@umassmed.edu> | 2020-08-04 18:35:37 -0400 |
|---|---|---|
| committer | Jack Huey <jack.huey@umassmed.edu> | 2020-09-04 19:12:54 -0400 |
| commit | d66452c3e5dfad901099493e8b86f5643d084a32 (patch) | |
| tree | 0e1137fe6057548502a7deda4e80d8c08ae7be78 /src/test/ui | |
| parent | 42d896afbd0314375a12465a14dc8d23b1b73a55 (diff) | |
Upgrade chalk to 0.21
Diffstat (limited to 'src/test/ui')
| -rw-r--r-- | src/test/ui/chalkify/type_inference.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/chalkify/type_inference.stderr | 8 | ||||
| -rw-r--r-- | src/test/ui/chalkify/type_wf.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/chalkify/type_wf.stderr | 8 |
4 files changed, 14 insertions, 6 deletions
diff --git a/src/test/ui/chalkify/type_inference.rs b/src/test/ui/chalkify/type_inference.rs index 2b62bf18a71..369777a7904 100644 --- a/src/test/ui/chalkify/type_inference.rs +++ b/src/test/ui/chalkify/type_inference.rs @@ -24,5 +24,5 @@ fn main() { // Here we have two solutions so we get back the behavior of the old-style // trait solver. - only_bar(x); //~ ERROR the trait bound `f64: Bar` is not satisfied + only_bar(x); //~ ERROR the trait bound `{float}: Bar` is not satisfied } diff --git a/src/test/ui/chalkify/type_inference.stderr b/src/test/ui/chalkify/type_inference.stderr index 5cfb968404d..fb8ccbfc660 100644 --- a/src/test/ui/chalkify/type_inference.stderr +++ b/src/test/ui/chalkify/type_inference.stderr @@ -1,11 +1,15 @@ -error[E0277]: the trait bound `f64: Bar` is not satisfied +error[E0277]: the trait bound `{float}: Bar` is not satisfied --> $DIR/type_inference.rs:27:5 | LL | fn only_bar<T: Bar>(_x: T) { } | --- required by this bound in `only_bar` ... LL | only_bar(x); - | ^^^^^^^^ the trait `Bar` is not implemented for `f64` + | ^^^^^^^^ the trait `Bar` is not implemented for `{float}` + | + = help: the following implementations were found: + <i32 as Bar> + <u32 as Bar> error: aborting due to previous error diff --git a/src/test/ui/chalkify/type_wf.rs b/src/test/ui/chalkify/type_wf.rs index 7c469d99c57..dd83a03fdf6 100644 --- a/src/test/ui/chalkify/type_wf.rs +++ b/src/test/ui/chalkify/type_wf.rs @@ -15,7 +15,7 @@ fn main() { x: 5, }; - let s = S { //~ ERROR the trait bound `f64: Foo` is not satisfied + let s = S { //~ ERROR the trait bound `{float}: Foo` is not satisfied x: 5.0, }; diff --git a/src/test/ui/chalkify/type_wf.stderr b/src/test/ui/chalkify/type_wf.stderr index ab585a6ed21..71009f1e97d 100644 --- a/src/test/ui/chalkify/type_wf.stderr +++ b/src/test/ui/chalkify/type_wf.stderr @@ -1,11 +1,15 @@ -error[E0277]: the trait bound `f64: Foo` is not satisfied +error[E0277]: the trait bound `{float}: Foo` is not satisfied --> $DIR/type_wf.rs:18:13 | LL | struct S<T: Foo> { | ---------------- required by `S` ... LL | let s = S { - | ^ the trait `Foo` is not implemented for `f64` + | ^ the trait `Foo` is not implemented for `{float}` + | + = help: the following implementations were found: + <i32 as Foo> + <std::option::Option<T> as Foo> error: aborting due to previous error |