diff --git a/src/test/mir-opt/end_region_4.rs b/src/test/mir-opt/end_region_4.rs index 359ed07a9c095..3d15f20bd05f3 100644 --- a/src/test/mir-opt/end_region_4.rs +++ b/src/test/mir-opt/end_region_4.rs @@ -44,7 +44,7 @@ fn foo(i: i32) { // let mut _5: i32; // bb0: { // StorageLive(_1); -// _1 = D::{{constructor}}(const 0i32,); +// _1 = D(const 0i32,); // FakeRead(ForLet, _1); // StorageLive(_2); // _2 = const 0i32; diff --git a/src/test/mir-opt/end_region_5.rs b/src/test/mir-opt/end_region_5.rs index 3b632e198cd66..06d1fbabe1616 100644 --- a/src/test/mir-opt/end_region_5.rs +++ b/src/test/mir-opt/end_region_5.rs @@ -37,7 +37,7 @@ fn foo(f: F) where F: FnOnce() -> i32 { // let mut _4: &'18s D; // bb0: { // StorageLive(_1); -// _1 = D::{{constructor}}(const 0i32,); +// _1 = D(const 0i32,); // FakeRead(ForLet, _1); // StorageLive(_3); // StorageLive(_4); diff --git a/src/test/mir-opt/end_region_6.rs b/src/test/mir-opt/end_region_6.rs index 03c7de02ec111..d0db23e6de0ee 100644 --- a/src/test/mir-opt/end_region_6.rs +++ b/src/test/mir-opt/end_region_6.rs @@ -37,7 +37,7 @@ fn foo(f: F) where F: FnOnce() -> i32 { // let mut _4: &'24s D; // bb0: { // StorageLive(_1); -// _1 = D::{{constructor}}(const 0i32,); +// _1 = D(const 0i32,); // FakeRead(ForLet, _1); // StorageLive(_3); // StorageLive(_4); diff --git a/src/test/mir-opt/end_region_7.rs b/src/test/mir-opt/end_region_7.rs index 56e3e0aa6f7a9..c7df440ebe2f3 100644 --- a/src/test/mir-opt/end_region_7.rs +++ b/src/test/mir-opt/end_region_7.rs @@ -36,7 +36,7 @@ fn foo(f: F) where F: FnOnce() -> i32 { // let mut _3: [closure@NodeId(33) d:D]; // bb0: { // StorageLive(_1); -// _1 = D::{{constructor}}(const 0i32,); +// _1 = D(const 0i32,); // FakeRead(ForLet, _1); // StorageLive(_3); // _3 = [closure@NodeId(33)] { d: move _1 }; diff --git a/src/test/mir-opt/end_region_8.rs b/src/test/mir-opt/end_region_8.rs index 0a54dcaa0d33f..9f2a9c3b72e8b 100644 --- a/src/test/mir-opt/end_region_8.rs +++ b/src/test/mir-opt/end_region_8.rs @@ -39,7 +39,7 @@ fn foo(f: F) where F: FnOnce() -> i32 { // let mut _4: [closure@NodeId(33) r:&'24s D]; // bb0: { // StorageLive(_1); -// _1 = D::{{constructor}}(const 0i32,); +// _1 = D(const 0i32,); // FakeRead(ForLet, _1); // StorageLive(_2); // _2 = &'26_1rs _1; diff --git a/src/test/mir-opt/end_region_destruction_extents_1.rs b/src/test/mir-opt/end_region_destruction_extents_1.rs index a5107d304386f..eb381dfc5521f 100644 --- a/src/test/mir-opt/end_region_destruction_extents_1.rs +++ b/src/test/mir-opt/end_region_destruction_extents_1.rs @@ -79,16 +79,16 @@ unsafe impl<'a, #[may_dangle] 'b> Drop for D1<'a, 'b> { // StorageLive(_3); // StorageLive(_4); // StorageLive(_5); -// _5 = S1::{{constructor}}(const "ex1",); +// _5 = S1(const "ex1",); // _4 = &'15ds _5; // _3 = &'15ds (*_4); // StorageLive(_6); // StorageLive(_7); // StorageLive(_8); -// _8 = S1::{{constructor}}(const "dang1",); +// _8 = S1(const "dang1",); // _7 = &'13s _8; // _6 = &'13s (*_7); -// _2 = D1<'15ds, '13s>::{{constructor}}(move _3, move _6); +// _2 = D1<'15ds, '13s>(move _3, move _6); // EndRegion('13s); // StorageDead(_6); // StorageDead(_3); @@ -132,7 +132,7 @@ unsafe impl<'a, #[may_dangle] 'b> Drop for D1<'a, 'b> { // StorageLive(_7); // _7 = &'13s (promoted[0]: S1); // _6 = &'13s (*_7); -// _2 = D1<'15ds, '13s>::{{constructor}}(move _3, move _6); +// _2 = D1<'15ds, '13s>(move _3, move _6); // EndRegion('13s); // StorageDead(_6); // StorageDead(_3); diff --git a/src/test/mir-opt/packed-struct-drop-aligned.rs b/src/test/mir-opt/packed-struct-drop-aligned.rs index 9441c6f4085a2..1fe29a29e2318 100644 --- a/src/test/mir-opt/packed-struct-drop-aligned.rs +++ b/src/test/mir-opt/packed-struct-drop-aligned.rs @@ -42,7 +42,7 @@ impl Drop for Droppy { // bb0: { // StorageLive(_1); // ... -// _1 = Packed::{{constructor}}(move _2,); +// _1 = Packed(move _2,); // ... // StorageLive(_6); // _6 = move (_1.0: Aligned); diff --git a/src/test/ui/issues/issue-21554.stderr b/src/test/ui/issues/issue-21554.stderr index be7762f1aa245..104970ea448aa 100644 --- a/src/test/ui/issues/issue-21554.stderr +++ b/src/test/ui/issues/issue-21554.stderr @@ -1,4 +1,4 @@ -error[E0606]: casting `fn(i32) -> Inches {Inches::{{constructor}}}` as `f32` is invalid +error[E0606]: casting `fn(i32) -> Inches {Inches}` as `f32` is invalid --> $DIR/issue-21554.rs:14:5 | LL | Inches as f32; diff --git a/src/test/ui/issues/issue-35241.stderr b/src/test/ui/issues/issue-35241.stderr index 42bf0aae5b12c..4404f88de311b 100644 --- a/src/test/ui/issues/issue-35241.stderr +++ b/src/test/ui/issues/issue-35241.stderr @@ -9,7 +9,7 @@ LL | fn test() -> Foo { Foo } //~ ERROR mismatched types | expected `Foo` because of return type | = note: expected type `Foo` - found type `fn(u32) -> Foo {Foo::{{constructor}}}` + found type `fn(u32) -> Foo {Foo}` error: aborting due to previous error diff --git a/src/test/ui/namespace/namespace-mix.stderr b/src/test/ui/namespace/namespace-mix.stderr index 6d72b6044aebe..0a297e58574f7 100644 --- a/src/test/ui/namespace/namespace-mix.stderr +++ b/src/test/ui/namespace/namespace-mix.stderr @@ -144,11 +144,11 @@ note: required by `check` LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error[E0277]: the trait bound `fn() -> c::TS {c::TS::{{constructor}}}: Impossible` is not satisfied +error[E0277]: the trait bound `fn() -> c::TS {c::TS}: Impossible` is not satisfied --> $DIR/namespace-mix.rs:66:5 | LL | check(m3::TS); //~ ERROR c::TS - | ^^^^^ the trait `Impossible` is not implemented for `fn() -> c::TS {c::TS::{{constructor}}}` + | ^^^^^ the trait `Impossible` is not implemented for `fn() -> c::TS {c::TS}` | note: required by `check` --> $DIR/namespace-mix.rs:31:1 @@ -192,11 +192,11 @@ note: required by `check` LL | fn check(_: T) {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error[E0277]: the trait bound `fn() -> namespace_mix::c::TS {namespace_mix::c::TS::{{constructor}}}: Impossible` is not satisfied +error[E0277]: the trait bound `fn() -> namespace_mix::c::TS {namespace_mix::c::TS}: Impossible` is not satisfied --> $DIR/namespace-mix.rs:72:5 | LL | check(xm3::TS); //~ ERROR c::TS - | ^^^^^ the trait `Impossible` is not implemented for `fn() -> namespace_mix::c::TS {namespace_mix::c::TS::{{constructor}}}` + | ^^^^^ the trait `Impossible` is not implemented for `fn() -> namespace_mix::c::TS {namespace_mix::c::TS}` | note: required by `check` --> $DIR/namespace-mix.rs:31:1 diff --git a/src/test/ui/privacy/private-inferred-type-3.rs b/src/test/ui/privacy/private-inferred-type-3.rs index 0c393f02323ec..5151f624b8d98 100644 --- a/src/test/ui/privacy/private-inferred-type-3.rs +++ b/src/test/ui/privacy/private-inferred-type-3.rs @@ -14,8 +14,8 @@ // error-pattern:static `PRIV_STATIC` is private // error-pattern:type `ext::PrivEnum` is private // error-pattern:type `fn() {::method}` is private -// error-pattern:type `fn(u8) -> ext::PrivTupleStruct {ext::PrivTupleStruct::{{constructor}}}` is pr -// error-pattern:type `fn(u8) -> ext::PubTupleStruct {ext::PubTupleStruct::{{constructor}}}` is priv +// error-pattern:type `fn(u8) -> ext::PrivTupleStruct {ext::PrivTupleStruct}` is private +// error-pattern:type `fn(u8) -> ext::PubTupleStruct {ext::PubTupleStruct}` is private // error-pattern:type `for<'r> fn(&'r ext::Pub) {>::priv_method}` is private #![feature(decl_macro)] diff --git a/src/test/ui/privacy/private-inferred-type-3.stderr b/src/test/ui/privacy/private-inferred-type-3.stderr index 3c37a7ee1e8d2..590ff76b375f2 100644 --- a/src/test/ui/privacy/private-inferred-type-3.stderr +++ b/src/test/ui/privacy/private-inferred-type-3.stderr @@ -30,7 +30,7 @@ LL | ext::m!(); | = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) -error: type `fn(u8) -> ext::PrivTupleStruct {ext::PrivTupleStruct::{{constructor}}}` is private +error: type `fn(u8) -> ext::PrivTupleStruct {ext::PrivTupleStruct}` is private --> $DIR/private-inferred-type-3.rs:26:5 | LL | ext::m!(); @@ -38,7 +38,7 @@ LL | ext::m!(); | = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) -error: type `fn(u8) -> ext::PubTupleStruct {ext::PubTupleStruct::{{constructor}}}` is private +error: type `fn(u8) -> ext::PubTupleStruct {ext::PubTupleStruct}` is private --> $DIR/private-inferred-type-3.rs:26:5 | LL | ext::m!(); diff --git a/src/test/ui/privacy/private-inferred-type.rs b/src/test/ui/privacy/private-inferred-type.rs index 3ca8b1eb2ed3a..58e17b24394a1 100644 --- a/src/test/ui/privacy/private-inferred-type.rs +++ b/src/test/ui/privacy/private-inferred-type.rs @@ -53,9 +53,9 @@ mod m { ::method; //~ ERROR type `fn() {::method}` is private ::method; // OK PrivTupleStruct; - //~^ ERROR type `fn(u8) -> m::PrivTupleStruct {m::PrivTupleStruct::{{constructor}}}` is priv + //~^ ERROR type `fn(u8) -> m::PrivTupleStruct {m::PrivTupleStruct}` is private PubTupleStruct; - //~^ ERROR type `fn(u8) -> m::PubTupleStruct {m::PubTupleStruct::{{constructor}}}` is privat + //~^ ERROR type `fn(u8) -> m::PubTupleStruct {m::PubTupleStruct}` is private Pub(0u8).priv_method(); //~^ ERROR type `for<'r> fn(&'r m::Pub) {>::priv_method}` is private } diff --git a/src/test/ui/privacy/private-inferred-type.stderr b/src/test/ui/privacy/private-inferred-type.stderr index abbe43fe384cb..1ab281cfc2515 100644 --- a/src/test/ui/privacy/private-inferred-type.stderr +++ b/src/test/ui/privacy/private-inferred-type.stderr @@ -115,7 +115,7 @@ LL | ::method; //~ ERROR type `fn() { m::PrivTupleStruct {m::PrivTupleStruct::{{constructor}}}` is private +error: type `fn(u8) -> m::PrivTupleStruct {m::PrivTupleStruct}` is private --> $DIR/private-inferred-type.rs:55:9 | LL | PrivTupleStruct; @@ -124,7 +124,7 @@ LL | PrivTupleStruct; LL | m::m!(); | -------- in this macro invocation -error: type `fn(u8) -> m::PubTupleStruct {m::PubTupleStruct::{{constructor}}}` is private +error: type `fn(u8) -> m::PubTupleStruct {m::PubTupleStruct}` is private --> $DIR/private-inferred-type.rs:57:9 | LL | PubTupleStruct;