about summary refs log tree commit diff
path: root/src/test/ui
diff options
context:
space:
mode:
authorben <benlewisj@gmail.com>2019-10-19 11:57:48 +1300
committerben <benlewisj@gmail.com>2019-10-20 09:16:52 +1300
commit925e3042f659c4a79bb742503cdbbd4ee4a731a2 (patch)
treed609bdcc450b8ee24b84b71b360804c6a2fab86b /src/test/ui
parentc49187530d1e5599101ff74bcf3f82888e768def (diff)
downloadrust-925e3042f659c4a79bb742503cdbbd4ee4a731a2.tar.gz
rust-925e3042f659c4a79bb742503cdbbd4ee4a731a2.zip
Fix resolve_type_vars_with_obligations not resolving const inference
variables.
Diffstat (limited to 'src/test/ui')
-rw-r--r--src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr b/src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr
index b7fd29ce706..7090cb880fd 100644
--- a/src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr
+++ b/src/test/ui/const-generics/const-argument-cross-crate-mismatch.stderr
@@ -1,20 +1,20 @@
 error[E0308]: mismatched types
-  --> $DIR/const-argument-cross-crate-mismatch.rs:6:41
+  --> $DIR/const-argument-cross-crate-mismatch.rs:6:67
    |
 LL |     let _ = const_generic_lib::function(const_generic_lib::Struct([0u8, 1u8]));
-   |                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `3usize`, found `2usize`
+   |                                                                   ^^^^^^^^^^ expected an array with a fixed size of 3 elements, found one with 2 elements
    |
-   = note: expected type `const_generic_lib::Struct<3usize>`
-              found type `const_generic_lib::Struct<_: usize>`
+   = note: expected type `[u8; 3]`
+              found type `[u8; 2]`
 
 error[E0308]: mismatched types
-  --> $DIR/const-argument-cross-crate-mismatch.rs:8:39
+  --> $DIR/const-argument-cross-crate-mismatch.rs:8:65
    |
 LL |     let _: const_generic_lib::Alias = const_generic_lib::Struct([0u8, 1u8, 2u8]);
-   |                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `2usize`, found `3usize`
+   |                                                                 ^^^^^^^^^^^^^^^ expected an array with a fixed size of 2 elements, found one with 3 elements
    |
-   = note: expected type `const_generic_lib::Struct<2usize>`
-              found type `const_generic_lib::Struct<_: usize>`
+   = note: expected type `[u8; 2]`
+              found type `[u8; 3]`
 
 error: aborting due to 2 previous errors