about summary refs log tree commit diff
path: root/src/test/ui/structs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-08-20 15:47:39 +0000
committerbors <bors@rust-lang.org>2018-08-20 15:47:39 +0000
commit1558ae7cfd5e1190d3388dcc6f0f734589e4e478 (patch)
treee5052cf7aa779cc0cd67d31c8723a0fd88ce5ff1 /src/test/ui/structs
parentbf1e461173e3936e4014cc951dfbdd7d9ec9190b (diff)
parentee9bd0fd99ef5049f53b5d8233369187637cb71c (diff)
downloadrust-1558ae7cfd5e1190d3388dcc6f0f734589e4e478.tar.gz
rust-1558ae7cfd5e1190d3388dcc6f0f734589e4e478.zip
Auto merge of #51880 - varkor:generics-hir-generalisation-followup, r=eddyb
The Great Generics Generalisation: HIR Followup

Addresses the final comments in #48149.

r? @eddyb, but there are a few things I have yet to clean up. Making the PR now to more easily see when things break.

cc @yodaldevoid
Diffstat (limited to 'src/test/ui/structs')
-rw-r--r--src/test/ui/structs/structure-constructor-type-mismatch.stderr8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.stderr b/src/test/ui/structs/structure-constructor-type-mismatch.stderr
index 1a88bc09dd6..dfa219e0872 100644
--- a/src/test/ui/structs/structure-constructor-type-mismatch.stderr
+++ b/src/test/ui/structs/structure-constructor-type-mismatch.stderr
@@ -71,10 +71,10 @@ LL |         x: 7,
               found type `{integer}`
 
 error[E0244]: wrong number of type arguments: expected 0, found 1
-  --> $DIR/structure-constructor-type-mismatch.rs:58:15
+  --> $DIR/structure-constructor-type-mismatch.rs:58:24
    |
 LL |     let pt3 = PointF::<i32> { //~ ERROR wrong number of type arguments
-   |               ^^^^^^^^^^^^^ expected no type arguments
+   |                        ^^^ unexpected type argument
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:59:12
@@ -101,10 +101,10 @@ LL |         y: 10, //~ ERROR mismatched types
               found type `{integer}`
 
 error[E0244]: wrong number of type arguments: expected 0, found 1
-  --> $DIR/structure-constructor-type-mismatch.rs:64:9
+  --> $DIR/structure-constructor-type-mismatch.rs:64:18
    |
 LL |         PointF::<u32> { .. } => {} //~ ERROR wrong number of type arguments
-   |         ^^^^^^^^^^^^^ expected no type arguments
+   |                  ^^^ unexpected type argument
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:64:9