Skip to content

Commit 5580b90

Browse files
nikomatsakisnikomatsakis
committed
s/HARD ERROR/hard error/ -- perhaps the warning is enough
1 parent 0254f69 commit 5580b90

File tree

5 files changed

+44
-44
lines changed

5 files changed

+44
-44
lines changed

‎src/librustc/lint/context.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ pub fn raw_struct_lint<'a>(sess: &'a Session,
447447
if let Some(future_incompatible) = lints.future_incompatible(LintId::of(lint)) {
448448
let explanation = format!("this was previously accepted by the compiler \
449449
but is being phased out, \
450-
and will become a HARD ERROR in a future release!");
450+
and will become a hard error in a future release!");
451451
let citation = format!("for more information, see {}",
452452
future_incompatible.reference);
453453
if let Some(sp) = span {

‎src/test/compile-fail/empty-struct-unit-pat.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ fn main() { //~ ERROR: compilation successful
3232
// }
3333
match e1 {
3434
Empty1(..) => () //~ WARN `Empty1` does not name a tuple variant or a tuple struct
35-
//~^ WARN HARD ERROR
35+
//~^ WARN hard error
3636
}
3737
// Rejected by parser as yet
3838
// match e2 {
3939
// E::Empty2() => () // ERROR `E::Empty2` does not name a tuple variant or a tuple struct
4040
// }
4141
match e2 {
4242
E::Empty2(..) => () //~ WARN `E::Empty2` does not name a tuple variant or a tuple struct
43-
//~^ WARN HARD ERROR
43+
//~^ WARN hard error
4444
}
4545
}

‎src/test/compile-fail/private-in-public-warn.rs‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,34 @@ mod types {
2626
}
2727

2828
pub type Alias = Priv; //~ WARN private type in public interface
29-
//~^ WARNING HARD ERROR
29+
//~^ WARNING hard error
3030
pub enum E {
3131
V1(Priv), //~ WARN private type in public interface
32-
//~^ WARNING HARD ERROR
32+
//~^ WARNING hard error
3333
V2 { field: Priv }, //~ WARN private type in public interface
34-
//~^ WARNING HARD ERROR
34+
//~^ WARNING hard error
3535
}
3636
pub trait Tr {
3737
const C: Priv = Priv; //~ WARN private type in public interface
38-
//~^ WARNING HARD ERROR
38+
//~^ WARNING hard error
3939
type Alias = Priv; //~ WARN private type in public interface
40-
//~^ WARNING HARD ERROR
40+
//~^ WARNING hard error
4141
fn f1(arg: Priv) {} //~ WARN private type in public interface
42-
//~^ WARNING HARD ERROR
42+
//~^ WARNING hard error
4343
fn f2() -> Priv { panic!() } //~ WARN private type in public interface
44-
//~^ WARNING HARD ERROR
44+
//~^ WARNING hard error
4545
}
4646
extern {
4747
pub static ES: Priv; //~ WARN private type in public interface
48-
//~^ WARNING HARD ERROR
48+
//~^ WARNING hard error
4949
pub fn ef1(arg: Priv); //~ WARN private type in public interface
50-
//~^ WARNING HARD ERROR
50+
//~^ WARNING hard error
5151
pub fn ef2() -> Priv; //~ WARN private type in public interface
52-
//~^ WARNING HARD ERROR
52+
//~^ WARNING hard error
5353
}
5454
impl PubTr for Pub {
5555
type Alias = Priv; //~ WARN private type in public interface
56-
//~^ WARNING HARD ERROR
56+
//~^ WARNING hard error
5757
}
5858
}
5959

@@ -64,21 +64,21 @@ mod traits {
6464

6565
pub type Alias<T: PrivTr> = T; //~ WARN private trait in public interface
6666
//~^ WARN trait bounds are not (yet) enforced in type definitions
67-
//~| WARNING HARD ERROR
67+
//~| WARNING hard error
6868
pub trait Tr1: PrivTr {} //~ WARN private trait in public interface
69-
//~^ WARNING HARD ERROR
69+
//~^ WARNING hard error
7070
pub trait Tr2<T: PrivTr> {} //~ WARN private trait in public interface
71-
//~^ WARNING HARD ERROR
71+
//~^ WARNING hard error
7272
pub trait Tr3 {
7373
type Alias: PrivTr; //~ WARN private trait in public interface
74-
//~^ WARNING HARD ERROR
74+
//~^ WARNING hard error
7575
fn f<T: PrivTr>(arg: T) {} //~ WARN private trait in public interface
76-
//~^ WARNING HARD ERROR
76+
//~^ WARNING hard error
7777
}
7878
impl<T: PrivTr> Pub<T> {} //~ WARN private trait in public interface
79-
//~^ WARNING HARD ERROR
79+
//~^ WARNING hard error
8080
impl<T: PrivTr> PubTr for Pub<T> {} //~ WARN private trait in public interface
81-
//~^ WARNING HARD ERROR
81+
//~^ WARNING hard error
8282
}
8383

8484
mod traits_where {
@@ -87,17 +87,17 @@ mod traits_where {
8787
pub trait PubTr {}
8888

8989
pub type Alias<T> where T: PrivTr = T; //~ WARN private trait in public interface
90-
//~^ WARNING HARD ERROR
90+
//~^ WARNING hard error
9191
pub trait Tr2<T> where T: PrivTr {} //~ WARN private trait in public interface
92-
//~^ WARNING HARD ERROR
92+
//~^ WARNING hard error
9393
pub trait Tr3 {
9494
fn f<T>(arg: T) where T: PrivTr {} //~ WARN private trait in public interface
95-
//~^ WARNING HARD ERROR
95+
//~^ WARNING hard error
9696
}
9797
impl<T> Pub<T> where T: PrivTr {} //~ WARN private trait in public interface
98-
//~^ WARNING HARD ERROR
98+
//~^ WARNING hard error
9999
impl<T> PubTr for Pub<T> where T: PrivTr {} //~ WARN private trait in public interface
100-
//~^ WARNING HARD ERROR
100+
//~^ WARNING hard error
101101
}
102102

103103
mod generics {
@@ -107,13 +107,13 @@ mod generics {
107107
pub trait PubTr<T> {}
108108

109109
pub trait Tr1: PrivTr<Pub> {} //~ WARN private trait in public interface
110-
//~^ WARNING HARD ERROR
110+
//~^ WARNING hard error
111111
pub trait Tr2: PubTr<Priv> {} //~ WARN private type in public interface
112-
//~^ WARNING HARD ERROR
112+
//~^ WARNING hard error
113113
pub trait Tr3: PubTr<[Priv; 1]> {} //~ WARN private type in public interface
114-
//~^ WARNING HARD ERROR
114+
//~^ WARNING hard error
115115
pub trait Tr4: PubTr<Pub<Priv>> {} //~ WARN private type in public interface
116-
//~^ WARNING HARD ERROR
116+
//~^ WARNING hard error
117117
}
118118

119119
mod impls {
@@ -140,7 +140,7 @@ mod impls {
140140
}
141141
impl PubTr for Pub {
142142
type Alias = Priv; //~ WARN private type in public interface
143-
//~^ WARNING HARD ERROR
143+
//~^ WARNING hard error
144144
}
145145
}
146146

@@ -207,27 +207,27 @@ mod aliases_pub {
207207
pub trait Tr1: PrivUseAliasTr {} // OK
208208
// This should be OK, if type aliases are substituted
209209
pub trait Tr2: PrivUseAliasTr<PrivAlias> {} //~ WARN private type in public interface
210-
//~^ WARNING HARD ERROR
210+
//~^ WARNING hard error
211211

212212
impl PrivAlias {
213213
pub fn f(arg: Priv) {} //~ WARN private type in public interface
214-
//~^ WARNING HARD ERROR
214+
//~^ WARNING hard error
215215
}
216216
// This doesn't even parse
217217
// impl <Priv as PrivTr>::AssocAlias {
218218
// pub fn f(arg: Priv) {} // WARN private type in public interface
219219
// }
220220
impl PrivUseAliasTr for PrivUseAlias {
221221
type Check = Priv; //~ WARN private type in public interface
222-
//~^ WARNING HARD ERROR
222+
//~^ WARNING hard error
223223
}
224224
impl PrivUseAliasTr for PrivAlias {
225225
type Check = Priv; //~ WARN private type in public interface
226-
//~^ WARNING HARD ERROR
226+
//~^ WARNING hard error
227227
}
228228
impl PrivUseAliasTr for <Priv as PrivTr>::AssocAlias {
229229
type Check = Priv; //~ WARN private type in public interface
230-
//~^ WARNING HARD ERROR
230+
//~^ WARNING hard error
231231
}
232232
}
233233

@@ -250,11 +250,11 @@ mod aliases_priv {
250250
impl PrivTr for Priv {}
251251

252252
pub trait Tr1: PrivUseAliasTr {} //~ WARN private trait in public interface
253-
//~^ WARNING HARD ERROR
253+
//~^ WARNING hard error
254254
pub trait Tr2: PrivUseAliasTr<PrivAlias> {} //~ WARN private trait in public interface
255255
//~^ WARN private type in public interface
256-
//~| WARNING HARD ERROR
257-
//~| WARNING HARD ERROR
256+
//~| WARNING hard error
257+
//~| WARNING hard error
258258

259259
impl PrivUseAlias {
260260
pub fn f(arg: Priv) {} // OK

‎src/test/compile-fail/private-variant-reexport.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@
1313

1414
mod m1 {
1515
pub use ::E::V; //~ WARN variant `V` is private, and cannot be reexported
16-
//~^ WARNING HARD ERROR
16+
//~^ WARNING hard error
1717
}
1818

1919
mod m2 {
2020
pub use ::E::{V}; //~ WARN variant `V` is private, and cannot be reexported
21-
//~^ WARNING HARD ERROR
21+
//~^ WARNING hard error
2222
}
2323

2424
mod m3 {
2525
pub use ::E::V::{self}; //~ WARN variant `V` is private, and cannot be reexported
26-
//~^ WARNING HARD ERROR
26+
//~^ WARNING hard error
2727
}
2828

2929
mod m4 {
3030
pub use ::E::*; //~ WARN variant `V` is private, and cannot be reexported
31-
//~^ WARNING HARD ERROR
31+
//~^ WARNING hard error
3232
}
3333

3434
enum E { V }

‎src/test/compile-fail/type-parameter-invalid-lint.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313

1414
fn avg<T=i32>(_: T) {}
1515
//~^ ERROR defaults for type parameters are only allowed
16-
//~| WARNING HARD ERROR
16+
//~| WARNING hard error
1717
fn main() {}

0 commit comments

Comments
 (0)