instantiate -> construct

compiler-errors · compiler-errors · commit 35f157073238 · 2022-10-19T02:55:23.000Z
diff --git a/compiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs b/compiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs
@@ -102,10 +102,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
             let msg = match def_id_or_name {
                 DefIdOrName::DefId(def_id) => match self.tcx.def_kind(def_id) {
-                    DefKind::Ctor(CtorOf::Struct, _) => "instantiate this tuple struct".to_string(),
-                    DefKind::Ctor(CtorOf::Variant, _) => {
-                        "instantiate this tuple variant".to_string()
-                    }
+                    DefKind::Ctor(CtorOf::Struct, _) => "construct this tuple struct".to_string(),
+                    DefKind::Ctor(CtorOf::Variant, _) => "construct this tuple variant".to_string(),
                     kind => format!("call this {}", kind.descr(def_id)),
                 },
                 DefIdOrName::Name(name) => format!("call this {name}"),
diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
@@ -923,10 +923,10 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
         let msg = match def_id_or_name {
             DefIdOrName::DefId(def_id) => match self.tcx.def_kind(def_id) {
                 DefKind::Ctor(CtorOf::Struct, _) => {
-                    "use parentheses to instantiate this tuple struct".to_string()
+                    "use parentheses to construct this tuple struct".to_string()
                 }
                 DefKind::Ctor(CtorOf::Variant, _) => {
-                    "use parentheses to instantiate this tuple variant".to_string()
+                    "use parentheses to construct this tuple variant".to_string()
                 }
                 kind => format!("use parentheses to call this {}", kind.descr(def_id)),
             },
diff --git a/src/test/ui/issues/issue-35241.stderr b/src/test/ui/issues/issue-35241.stderr
@@ -11,7 +11,7 @@ LL | fn test() -> Foo { Foo }
    |
    = note: expected struct `Foo`
              found fn item `fn(u32) -> Foo {Foo}`
-help: use parentheses to instantiate this tuple struct
+help: use parentheses to construct this tuple struct
    |
 LL | fn test() -> Foo { Foo(/* u32 */) }
    |                       +++++++++++
diff --git a/src/test/ui/resolve/privacy-enum-ctor.stderr b/src/test/ui/resolve/privacy-enum-ctor.stderr
@@ -327,7 +327,7 @@ LL |         let _: Z = Z::Fn;
    |
    = note: expected enum `Z`
            found fn item `fn(u8) -> Z {Z::Fn}`
-help: use parentheses to instantiate this tuple variant
+help: use parentheses to construct this tuple variant
    |
 LL |         let _: Z = Z::Fn(/* u8 */);
    |                         ++++++++++
@@ -362,7 +362,7 @@ LL |     let _: E = m::E::Fn;
    |
    = note: expected enum `E`
            found fn item `fn(u8) -> E {E::Fn}`
-help: use parentheses to instantiate this tuple variant
+help: use parentheses to construct this tuple variant
    |
 LL |     let _: E = m::E::Fn(/* u8 */);
    |                        ++++++++++
@@ -397,7 +397,7 @@ LL |     let _: E = E::Fn;
    |
    = note: expected enum `E`
            found fn item `fn(u8) -> E {E::Fn}`
-help: use parentheses to instantiate this tuple variant
+help: use parentheses to construct this tuple variant
    |
 LL |     let _: E = E::Fn(/* u8 */);
    |                     ++++++++++
diff --git a/src/test/ui/suggestions/call-on-unimplemented-ctor.rs b/src/test/ui/suggestions/call-on-unimplemented-ctor.rs
@@ -2,7 +2,7 @@ fn main() {
     insert_resource(Marker);
     insert_resource(Time);
     //~^ ERROR the trait bound `fn(u32) -> Time {Time}: Resource` is not satisfied
-    //~| HELP use parentheses to instantiate this tuple struct
+    //~| HELP use parentheses to construct this tuple struct
 }
 
 trait Resource {}
diff --git a/src/test/ui/suggestions/call-on-unimplemented-ctor.stderr b/src/test/ui/suggestions/call-on-unimplemented-ctor.stderr
@@ -11,7 +11,7 @@ note: required by a bound in `insert_resource`
    |
 LL | fn insert_resource<R: Resource>(resource: R) {}
    |                       ^^^^^^^^ required by this bound in `insert_resource`
-help: use parentheses to instantiate this tuple struct
+help: use parentheses to construct this tuple struct
    |
 LL |     insert_resource(Time(/* u32 */));
    |                         +++++++++++
diff --git a/src/test/ui/suggestions/fn-or-tuple-struct-without-args.stderr b/src/test/ui/suggestions/fn-or-tuple-struct-without-args.stderr
@@ -49,7 +49,7 @@ LL |     let _: S = S;
    |
    = note: expected struct `S`
              found fn item `fn(usize, usize) -> S {S}`
-help: use parentheses to instantiate this tuple struct
+help: use parentheses to construct this tuple struct
    |
 LL |     let _: S = S(/* usize */, /* usize */);
    |                 ++++++++++++++++++++++++++
@@ -85,7 +85,7 @@ LL |     let _: V = V;
    |
    = note: expected struct `V`
              found fn item `fn() -> V {V}`
-help: use parentheses to instantiate this tuple struct
+help: use parentheses to construct this tuple struct
    |
 LL |     let _: V = V();
    |                 ++
@@ -139,7 +139,7 @@ LL |     let _: E = E::A;
    |
    = note: expected enum `E`
            found fn item `fn(usize) -> E {E::A}`
-help: use parentheses to instantiate this tuple variant
+help: use parentheses to construct this tuple variant
    |
 LL |     let _: E = E::A(/* usize */);
    |                    +++++++++++++
diff --git a/src/test/ui/typeck/issue-87181/empty-tuple-method.stderr b/src/test/ui/typeck/issue-87181/empty-tuple-method.stderr
@@ -4,7 +4,7 @@ error[E0599]: no method named `foo` found for fn item `fn() -> Foo {Foo}` in the
 LL |     thing.bar.foo();
    |               ^^^ method not found in `fn() -> Foo {Foo}`
    |
-help: use parentheses to instantiate this tuple struct
+help: use parentheses to construct this tuple struct
    |
 LL |     (thing.bar)().foo();
    |     +         +++
diff --git a/src/test/ui/typeck/issue-87181/enum-variant.stderr b/src/test/ui/typeck/issue-87181/enum-variant.stderr
@@ -4,7 +4,7 @@ error[E0599]: no method named `foo` found for fn item `fn() -> Foo {Foo::Tup}` i
 LL |     thing.bar.foo();
    |               ^^^ method not found in `fn() -> Foo {Foo::Tup}`
    |
-help: use parentheses to instantiate this tuple variant
+help: use parentheses to construct this tuple variant
    |
 LL |     (thing.bar)().foo();
    |     +         +++
diff --git a/src/test/ui/typeck/issue-87181/tuple-field.stderr b/src/test/ui/typeck/issue-87181/tuple-field.stderr
@@ -4,7 +4,7 @@ error[E0609]: no field `0` on type `fn(char, u16) -> Foo {Foo}`
 LL |     thing.bar.0;
    |               ^
    |
-help: use parentheses to instantiate this tuple struct
+help: use parentheses to construct this tuple struct
    |
 LL |     (thing.bar)(/* char */, /* u16 */).0;
    |     +         ++++++++++++++++++++++++

Original file line number	Diff line number	Diff line change
`@@ -923,10 +923,10 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {`
`923`	`923`	`let msg = match def_id_or_name {`
`924`	`924`	`DefIdOrName::DefId(def_id) => match self.tcx.def_kind(def_id) {`
`925`	`925`	`DefKind::Ctor(CtorOf::Struct, _) => {`
`926`		`- "use parentheses to instantiate this tuple struct".to_string()`
	`926`	`+ "use parentheses to construct this tuple struct".to_string()`
`927`	`927`	`}`
`928`	`928`	`DefKind::Ctor(CtorOf::Variant, _) => {`
`929`		`- "use parentheses to instantiate this tuple variant".to_string()`
	`929`	`+ "use parentheses to construct this tuple variant".to_string()`
`930`	`930`	`}`
`931`	`931`	`kind => format!("use parentheses to call this {}", kind.descr(def_id)),`
`932`	`932`	`},`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ LL \| fn test() -> Foo { Foo }`
`11`	`11`	`\|`
`12`	`12`	= note: expected struct `Foo`
`13`	`13`	found fn item `fn(u32) -> Foo {Foo}`
`14`		`-help: use parentheses to instantiate this tuple struct`
	`14`	`+help: use parentheses to construct this tuple struct`
`15`	`15`	`\|`
`16`	`16`	`LL \| fn test() -> Foo { Foo(/* u32 */) }`
`17`	`17`	`\| +++++++++++`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ LL \| let _: Z = Z::Fn;`
`327`	`327`	`\|`
`328`	`328`	= note: expected enum `Z`
`329`	`329`	found fn item `fn(u8) -> Z {Z::Fn}`
`330`		`-help: use parentheses to instantiate this tuple variant`
	`330`	`+help: use parentheses to construct this tuple variant`
`331`	`331`	`\|`
`332`	`332`	`LL \| let _: Z = Z::Fn(/* u8 */);`
`333`	`333`	`\| ++++++++++`
`@@ -362,7 +362,7 @@ LL \| let _: E = m::E::Fn;`
`362`	`362`	`\|`
`363`	`363`	= note: expected enum `E`
`364`	`364`	found fn item `fn(u8) -> E {E::Fn}`
`365`		`-help: use parentheses to instantiate this tuple variant`
	`365`	`+help: use parentheses to construct this tuple variant`
`366`	`366`	`\|`
`367`	`367`	`LL \| let _: E = m::E::Fn(/* u8 */);`
`368`	`368`	`\| ++++++++++`
`@@ -397,7 +397,7 @@ LL \| let _: E = E::Fn;`
`397`	`397`	`\|`
`398`	`398`	= note: expected enum `E`
`399`	`399`	found fn item `fn(u8) -> E {E::Fn}`
`400`		`-help: use parentheses to instantiate this tuple variant`
	`400`	`+help: use parentheses to construct this tuple variant`
`401`	`401`	`\|`
`402`	`402`	`LL \| let _: E = E::Fn(/* u8 */);`
`403`	`403`	`\| ++++++++++`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ fn main() {`
`2`	`2`	`insert_resource(Marker);`
`3`	`3`	`insert_resource(Time);`
`4`	`4`	//~^ ERROR the trait bound `fn(u32) -> Time {Time}: Resource` is not satisfied
`5`		`- //~\| HELP use parentheses to instantiate this tuple struct`
	`5`	`+ //~\| HELP use parentheses to construct this tuple struct`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`trait Resource {}`
Original file line number	Diff line number	Diff line change
@@ -11,7 +11,7 @@ note: required by a bound in `insert_resource`
`11`	`11`	`\|`
`12`	`12`	`LL \| fn insert_resource<R: Resource>(resource: R) {}`
`13`	`13`	\| ^^^^^^^^ required by this bound in `insert_resource`
`14`		`-help: use parentheses to instantiate this tuple struct`
	`14`	`+help: use parentheses to construct this tuple struct`
`15`	`15`	`\|`
`16`	`16`	`LL \| insert_resource(Time(/* u32 */));`
`17`	`17`	`\| +++++++++++`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ LL \| let _: S = S;`
`49`	`49`	`\|`
`50`	`50`	= note: expected struct `S`
`51`	`51`	found fn item `fn(usize, usize) -> S {S}`
`52`		`-help: use parentheses to instantiate this tuple struct`
	`52`	`+help: use parentheses to construct this tuple struct`
`53`	`53`	`\|`
`54`	`54`	`LL \| let _: S = S(/* usize /, / usize */);`
`55`	`55`	`\| ++++++++++++++++++++++++++`
`@@ -85,7 +85,7 @@ LL \| let _: V = V;`
`85`	`85`	`\|`
`86`	`86`	= note: expected struct `V`
`87`	`87`	found fn item `fn() -> V {V}`
`88`		`-help: use parentheses to instantiate this tuple struct`
	`88`	`+help: use parentheses to construct this tuple struct`
`89`	`89`	`\|`
`90`	`90`	`LL \| let _: V = V();`
`91`	`91`	`\| ++`
`@@ -139,7 +139,7 @@ LL \| let _: E = E::A;`
`139`	`139`	`\|`
`140`	`140`	= note: expected enum `E`
`141`	`141`	found fn item `fn(usize) -> E {E::A}`
`142`		`-help: use parentheses to instantiate this tuple variant`
	`142`	`+help: use parentheses to construct this tuple variant`
`143`	`143`	`\|`
`144`	`144`	`LL \| let _: E = E::A(/* usize */);`
`145`	`145`	`\| +++++++++++++`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error[E0599]: no method named `foo` found for fn item `fn() -> Foo {Foo}` in the
`4`	`4`	`LL \| thing.bar.foo();`
`5`	`5`	\| ^^^ method not found in `fn() -> Foo {Foo}`
`6`	`6`	`\|`
`7`		`-help: use parentheses to instantiate this tuple struct`
	`7`	`+help: use parentheses to construct this tuple struct`
`8`	`8`	`\|`
`9`	`9`	`LL \| (thing.bar)().foo();`
`10`	`10`	`\| + +++`
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@ error[E0609]: no field `0` on type `fn(char, u16) -> Foo {Foo}`
`4`	`4`	`LL \| thing.bar.0;`
`5`	`5`	`\| ^`
`6`	`6`	`\|`
`7`		`-help: use parentheses to instantiate this tuple struct`
	`7`	`+help: use parentheses to construct this tuple struct`
`8`	`8`	`\|`
`9`	`9`	`LL \| (thing.bar)(/* char /, / u16 */).0;`
`10`	`10`	`\| + ++++++++++++++++++++++++`