diff options
| author | scalexm <alexandre@scalexm.fr> | 2018-11-03 19:34:28 +0100 |
|---|---|---|
| committer | scalexm <alexandre@scalexm.fr> | 2018-11-13 12:28:43 +0100 |
| commit | 8d0b9697b5739c1e6bb6e9eea513218e5a60cb1a (patch) | |
| tree | d633d2c23f6b5c294e318c5e603e6a526bd3f43e | |
| parent | afa884c03a90f4d773e28faaad4bc7845d677332 (diff) | |
| download | rust-8d0b9697b5739c1e6bb6e9eea513218e5a60cb1a.tar.gz rust-8d0b9697b5739c1e6bb6e9eea513218e5a60cb1a.zip | |
Fix ui tests
| -rw-r--r-- | src/test/ui/nll/user-annotations/dump-fn-method.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/nll/user-annotations/dump-fn-method.stderr | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/test/ui/nll/user-annotations/dump-fn-method.rs b/src/test/ui/nll/user-annotations/dump-fn-method.rs index 7f726d13a33..ef5fb8eadc3 100644 --- a/src/test/ui/nll/user-annotations/dump-fn-method.rs +++ b/src/test/ui/nll/user-annotations/dump-fn-method.rs @@ -39,7 +39,7 @@ fn main() { // Here: we only want the `T` to be given, the rest should be variables. // // (`T` refers to the declaration of `Bazoom`) - let x = <_ as Bazoom<u32>>::method::<_>; //~ ERROR [?0, u32, ?1] + let x = <_ as Bazoom<u32>>::method::<_>; //~ ERROR [^0, u32, ^1] x(&22, 44, 66); // Here: all are given @@ -51,7 +51,7 @@ fn main() { // // (`U` refers to the declaration of `Bazoom`) let y = 22_u32; - y.method::<u32>(44, 66); //~ ERROR [?0, ?1, u32] + y.method::<u32>(44, 66); //~ ERROR [^0, ^1, u32] // Here: nothing is given, so we don't have any annotation. let y = 22_u32; diff --git a/src/test/ui/nll/user-annotations/dump-fn-method.stderr b/src/test/ui/nll/user-annotations/dump-fn-method.stderr index 3beb994a4e8..359423d0cfb 100644 --- a/src/test/ui/nll/user-annotations/dump-fn-method.stderr +++ b/src/test/ui/nll/user-annotations/dump-fn-method.stderr @@ -4,10 +4,10 @@ error: user substs: Canonical { max_universe: U0, variables: [], value: UserSubs LL | let x = foo::<u32>; //~ ERROR [u32] | ^^^^^^^^^^ -error: user substs: Canonical { max_universe: U0, variables: [CanonicalVarInfo { kind: Ty(General) }, CanonicalVarInfo { kind: Ty(General) }], value: UserSubsts { substs: [?0, u32, ?1], user_self_ty: None } } +error: user substs: Canonical { max_universe: U0, variables: [CanonicalVarInfo { kind: Ty(General) }, CanonicalVarInfo { kind: Ty(General) }], value: UserSubsts { substs: [^0, u32, ^1], user_self_ty: None } } --> $DIR/dump-fn-method.rs:42:13 | -LL | let x = <_ as Bazoom<u32>>::method::<_>; //~ ERROR [?0, u32, ?1] +LL | let x = <_ as Bazoom<u32>>::method::<_>; //~ ERROR [^0, u32, ^1] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: user substs: Canonical { max_universe: U0, variables: [], value: UserSubsts { substs: [u8, u16, u32], user_self_ty: None } } @@ -16,10 +16,10 @@ error: user substs: Canonical { max_universe: U0, variables: [], value: UserSubs LL | let x = <u8 as Bazoom<u16>>::method::<u32>; //~ ERROR [u8, u16, u32] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: user substs: Canonical { max_universe: U0, variables: [CanonicalVarInfo { kind: Ty(General) }, CanonicalVarInfo { kind: Ty(General) }], value: UserSubsts { substs: [?0, ?1, u32], user_self_ty: None } } +error: user substs: Canonical { max_universe: U0, variables: [CanonicalVarInfo { kind: Ty(General) }, CanonicalVarInfo { kind: Ty(General) }], value: UserSubsts { substs: [^0, ^1, u32], user_self_ty: None } } --> $DIR/dump-fn-method.rs:54:5 | -LL | y.method::<u32>(44, 66); //~ ERROR [?0, ?1, u32] +LL | y.method::<u32>(44, 66); //~ ERROR [^0, ^1, u32] | ^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to 4 previous errors |