user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve: shorten wording on private constructor error

Browse source
This commit is contained in:
Dan Aloni 2019-10-11 22:00:15 +03:00
parent 7140c024c2
commit 9d11bda8dd
4 changed files with 56 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_resolve/lib.rs
View file

@ -2401,7 +2401,7 @@ impl<'a> Resolver<'a> {
let first_field = fields.first().expect("empty field list in the map");
err.span_label(
fields.iter().fold(first_field.span, |acc, field| acc.to(field.span)),
"a tuple struct constructor is private if any of its fields is private",
"a constructor is private if any of the fields is private",
);
err
} else {

96
src/test/ui/privacy/privacy5.stderr
View file

@ -2,7 +2,7 @@ error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:51:16
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
...
LL | let a = a::A(());
| ^
@ -11,7 +11,7 @@ error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:52:16
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
...
LL | let b = a::B(2);
| ^
@ -20,7 +20,7 @@ error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:53:16
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
...
LL | let c = a::C(2, 3);
| ^
@ -29,7 +29,7 @@ error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:56:12
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
...
LL | let a::A(()) = a;
| ^
@ -38,7 +38,7 @@ error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:57:12
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
...
LL | let a::A(_) = a;
| ^
@ -47,7 +47,7 @@ error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:58:18
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
...
LL | match a { a::A(()) => {} }
| ^
@ -56,7 +56,7 @@ error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:59:18
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
...
LL | match a { a::A(_) => {} }
| ^
@ -65,7 +65,7 @@ error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:61:12
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
...
LL | let a::B(_) = b;
| ^
@ -74,7 +74,7 @@ error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:62:12
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
...
LL | let a::B(_b) = b;
| ^
@ -83,7 +83,7 @@ error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:63:18
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
...
LL | match b { a::B(_) => {} }
| ^
@ -92,7 +92,7 @@ error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:64:18
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
...
LL | match b { a::B(_b) => {} }
| ^
@ -101,7 +101,7 @@ error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:65:18
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
...
LL | match b { a::B(1) => {} a::B(_) => {} }
| ^
@ -110,7 +110,7 @@ error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:65:32
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
...
LL | match b { a::B(1) => {} a::B(_) => {} }
| ^
@ -119,7 +119,7 @@ error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:68:12
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
...
LL | let a::C(_, _) = c;
| ^
@ -128,7 +128,7 @@ error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:69:12
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
...
LL | let a::C(_a, _) = c;
| ^
@ -137,7 +137,7 @@ error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:70:12
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
...
LL | let a::C(_, _b) = c;
| ^
@ -146,7 +146,7 @@ error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:71:12
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
...
LL | let a::C(_a, _b) = c;
| ^
@ -155,7 +155,7 @@ error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:72:18
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
...
LL | match c { a::C(_, _) => {} }
| ^
@ -164,7 +164,7 @@ error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:73:18
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
...
LL | match c { a::C(_a, _) => {} }
| ^
@ -173,7 +173,7 @@ error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:74:18
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
...
LL | match c { a::C(_, _b) => {} }
| ^
@ -182,7 +182,7 @@ error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:75:18
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
...
LL | match c { a::C(_a, _b) => {} }
| ^
@ -191,7 +191,7 @@ error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:83:17
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
...
LL | let a2 = a::A;
| ^
@ -200,7 +200,7 @@ error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:84:17
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
...
LL | let b2 = a::B;
| ^
@ -209,7 +209,7 @@ error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:85:17
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
...
LL | let c2 = a::C;
| ^
@ -223,7 +223,7 @@ LL | let a = other::A(());
::: $DIR/auxiliary/privacy_tuple_struct.rs:1:14
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:91:20
@ -234,7 +234,7 @@ LL | let b = other::B(2);
::: $DIR/auxiliary/privacy_tuple_struct.rs:2:14
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:92:20
@ -245,7 +245,7 @@ LL | let c = other::C(2, 3);
::: $DIR/auxiliary/privacy_tuple_struct.rs:3:14
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:95:16
@ -256,7 +256,7 @@ LL | let other::A(()) = a;
::: $DIR/auxiliary/privacy_tuple_struct.rs:1:14
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:96:16
@ -267,7 +267,7 @@ LL | let other::A(_) = a;
::: $DIR/auxiliary/privacy_tuple_struct.rs:1:14
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:97:22
@ -278,7 +278,7 @@ LL | match a { other::A(()) => {} }
::: $DIR/auxiliary/privacy_tuple_struct.rs:1:14
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:98:22
@ -289,7 +289,7 @@ LL | match a { other::A(_) => {} }
::: $DIR/auxiliary/privacy_tuple_struct.rs:1:14
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:100:16
@ -300,7 +300,7 @@ LL | let other::B(_) = b;
::: $DIR/auxiliary/privacy_tuple_struct.rs:2:14
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:101:16
@ -311,7 +311,7 @@ LL | let other::B(_b) = b;
::: $DIR/auxiliary/privacy_tuple_struct.rs:2:14
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:102:22
@ -322,7 +322,7 @@ LL | match b { other::B(_) => {} }
::: $DIR/auxiliary/privacy_tuple_struct.rs:2:14
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:103:22
@ -333,7 +333,7 @@ LL | match b { other::B(_b) => {} }
::: $DIR/auxiliary/privacy_tuple_struct.rs:2:14
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:104:22
@ -344,7 +344,7 @@ LL | match b { other::B(1) => {}
::: $DIR/auxiliary/privacy_tuple_struct.rs:2:14
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:105:16
@ -355,7 +355,7 @@ LL | other::B(_) => {} }
::: $DIR/auxiliary/privacy_tuple_struct.rs:2:14
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:107:16
@ -366,7 +366,7 @@ LL | let other::C(_, _) = c;
::: $DIR/auxiliary/privacy_tuple_struct.rs:3:14
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:108:16
@ -377,7 +377,7 @@ LL | let other::C(_a, _) = c;
::: $DIR/auxiliary/privacy_tuple_struct.rs:3:14
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:109:16
@ -388,7 +388,7 @@ LL | let other::C(_, _b) = c;
::: $DIR/auxiliary/privacy_tuple_struct.rs:3:14
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:110:16
@ -399,7 +399,7 @@ LL | let other::C(_a, _b) = c;
::: $DIR/auxiliary/privacy_tuple_struct.rs:3:14
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:111:22
@ -410,7 +410,7 @@ LL | match c { other::C(_, _) => {} }
::: $DIR/auxiliary/privacy_tuple_struct.rs:3:14
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:112:22
@ -421,7 +421,7 @@ LL | match c { other::C(_a, _) => {} }
::: $DIR/auxiliary/privacy_tuple_struct.rs:3:14
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:113:22
@ -432,7 +432,7 @@ LL | match c { other::C(_, _b) => {} }
::: $DIR/auxiliary/privacy_tuple_struct.rs:3:14
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:114:22
@ -443,7 +443,7 @@ LL | match c { other::C(_a, _b) => {} }
::: $DIR/auxiliary/privacy_tuple_struct.rs:3:14
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `A` is private
--> $DIR/privacy5.rs:122:21
@ -454,7 +454,7 @@ LL | let a2 = other::A;
::: $DIR/auxiliary/privacy_tuple_struct.rs:1:14
|
LL | pub struct A(());
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `B` is private
--> $DIR/privacy5.rs:123:21
@ -465,7 +465,7 @@ LL | let b2 = other::B;
::: $DIR/auxiliary/privacy_tuple_struct.rs:2:14
|
LL | pub struct B(isize);
| ----- a tuple struct constructor is private if any of its fields is private
| ----- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `C` is private
--> $DIR/privacy5.rs:124:21
@ -476,7 +476,7 @@ LL | let c2 = other::C;
::: $DIR/auxiliary/privacy_tuple_struct.rs:3:14
|
LL | pub struct C(pub isize, isize);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error: aborting due to 48 previous errors

12
src/test/ui/resolve/privacy-struct-ctor.stderr
View file

@ -38,7 +38,7 @@ error[E0603]: tuple struct constructor `Z` is private
--> $DIR/privacy-struct-ctor.rs:18:12
|
LL | pub(in m) struct Z(pub(in m::n) u8);
| --------------- a tuple struct constructor is private if any of its fields is private
| --------------- a constructor is private if any of the fields is private
...
LL | n::Z;
| ^
@ -47,7 +47,7 @@ error[E0603]: tuple struct constructor `S` is private
--> $DIR/privacy-struct-ctor.rs:29:8
|
LL | pub struct S(u8);
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
...
LL | m::S;
| ^
@ -56,7 +56,7 @@ error[E0603]: tuple struct constructor `S` is private
--> $DIR/privacy-struct-ctor.rs:31:19
|
LL | pub struct S(u8);
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
...
LL | let _: S = m::S(2);
| ^
@ -65,7 +65,7 @@ error[E0603]: tuple struct constructor `Z` is private
--> $DIR/privacy-struct-ctor.rs:35:11
|
LL | pub(in m) struct Z(pub(in m::n) u8);
| --------------- a tuple struct constructor is private if any of its fields is private
| --------------- a constructor is private if any of the fields is private
...
LL | m::n::Z;
| ^
@ -79,7 +79,7 @@ LL | xcrate::m::S;
::: $DIR/auxiliary/privacy-struct-ctor.rs:2:18
|
LL | pub struct S(u8);
| -- a tuple struct constructor is private if any of its fields is private
| -- a constructor is private if any of the fields is private
error[E0603]: tuple struct constructor `Z` is private
--> $DIR/privacy-struct-ctor.rs:45:19
@ -90,7 +90,7 @@ LL | xcrate::m::n::Z;
::: $DIR/auxiliary/privacy-struct-ctor.rs:5:28
|
LL | pub(in m) struct Z(pub(in m::n) u8);
| --------------- a tuple struct constructor is private if any of its fields is private
| --------------- a constructor is private if any of the fields is private
error: aborting due to 10 previous errors

2
src/test/ui/rfc-2008-non-exhaustive/struct.stderr
View file

@ -19,7 +19,7 @@ LL | let ts_explicit = structs::TupleStruct(640, 480);
::: $DIR/auxiliary/structs.rs:13:24
|
LL | pub struct TupleStruct(pub u16, pub u16);
| ---------------- a tuple struct constructor is private if any of its fields is private
| ---------------- a constructor is private if any of the fields is private
error[E0603]: unit struct `UnitStruct` is private
--> $DIR/struct.rs:32:32