Skip to content

Commit 6a02e20

Browse files
dtolnaydtolnay
committed
Update since stability attributes in tests
1 parent 82ed3f5 commit 6a02e20

15 files changed

+79
-69
lines changed

‎tests/rustdoc/implementor-stable-version.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
#![stable(feature = "bar", since = "OLD 1.0")]
1+
#![stable(feature = "bar", since = "3.3.3")]
22
#![crate_name = "foo"]
33

44
#![feature(staged_api)]
55

6-
#[stable(feature = "bar", since = "OLD 1.0")]
6+
#[stable(feature = "bar", since = "3.3.3")]
77
pub trait Bar {}
88

9-
#[stable(feature = "baz", since = "OLD 1.0")]
9+
#[stable(feature = "baz", since = "3.3.3")]
1010
pub trait Baz {}
1111

12-
#[stable(feature = "baz", since = "OLD 1.0")]
12+
#[stable(feature = "baz", since = "3.3.3")]
1313
pub struct Foo;
1414

15-
// @has foo/trait.Bar.html '//div[@id="implementors-list"]//span[@class="since"]' 'NEW 2.0'
16-
#[stable(feature = "foobar", since = "NEW 2.0")]
15+
// @has foo/trait.Bar.html '//div[@id="implementors-list"]//span[@class="since"]' '4.4.4'
16+
#[stable(feature = "foobar", since = "4.4.4")]
1717
impl Bar for Foo {}
1818

19-
// @!has foo/trait.Baz.html '//div[@id="implementors-list"]//span[@class="since"]' 'OLD 1.0'
20-
#[stable(feature = "foobaz", since = "OLD 1.0")]
19+
// @!has foo/trait.Baz.html '//div[@id="implementors-list"]//span[@class="since"]' '3.3.3'
20+
#[stable(feature = "foobaz", since = "3.3.3")]
2121
impl Baz for Foo {}

‎tests/ui/attributes/const-stability-on-macro.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![feature(staged_api)]
22
#![stable(feature = "rust1", since = "1.0.0")]
33

4-
#[rustc_const_stable(feature = "foo", since = "0")]
4+
#[rustc_const_stable(feature = "foo", since = "3.3.3")]
55
//~^ ERROR macros cannot have const stability attributes
66
macro_rules! foo {
77
() => {};

‎tests/ui/attributes/const-stability-on-macro.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: macros cannot have const stability attributes
22
--> $DIR/const-stability-on-macro.rs:4:1
33
|
4-
LL | #[rustc_const_stable(feature = "foo", since = "0")]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid const stability attribute
4+
LL | #[rustc_const_stable(feature = "foo", since = "3.3.3")]
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid const stability attribute
66
LL |
77
LL | macro_rules! foo {
88
| ---------------- const stability attribute affects this macro

‎tests/ui/const-generics/defaults/default-annotation.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
// FIXME(const_generics_defaults): It seems like we aren't testing the right thing here,
55
// I would assume that we want the attributes to apply to the const parameter defaults
66
// themselves.
7-
#![stable(feature = "const_default_test", since="none")]
7+
#![stable(feature = "const_default_test", since = "3.3.3")]
88

9-
#[unstable(feature = "const_default_stable", issue="none")]
9+
#[unstable(feature = "const_default_stable", issue = "none")]
1010
pub struct ConstDefaultUnstable<const N: usize = 3>;
1111

12-
#[stable(feature = "const_default_unstable", since="none")]
12+
#[stable(feature = "const_default_unstable", since = "3.3.3")]
1313
pub struct ConstDefaultStable<const N: usize = {
1414
3
1515
}>;

‎tests/ui/feature-gates/feature-gate-staged_api.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#![stable(feature = "a", since = "b")]
1+
#![stable(feature = "a", since = "3.3.3")]
22
//~^ ERROR stability attributes may not be used outside of the standard library
33
mod inner_private_module {
44
// UnnameableTypeAlias isn't marked as reachable, so no stability annotation is required here
55
pub type UnnameableTypeAlias = u8;
66
}
77

8-
#[stable(feature = "a", since = "b")]
8+
#[stable(feature = "a", since = "3.3.3")]
99
//~^ ERROR stability attributes may not be used outside of the standard library
1010
pub fn f() -> inner_private_module::UnnameableTypeAlias {
1111
0

‎tests/ui/feature-gates/feature-gate-staged_api.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
error[E0734]: stability attributes may not be used outside of the standard library
22
--> $DIR/feature-gate-staged_api.rs:8:1
33
|
4-
LL | #[stable(feature = "a", since = "b")]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
LL | #[stable(feature = "a", since = "3.3.3")]
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error[E0734]: stability attributes may not be used outside of the standard library
88
--> $DIR/feature-gate-staged_api.rs:1:1
99
|
10-
LL | #![stable(feature = "a", since = "b")]
11-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
10+
LL | #![stable(feature = "a", since = "3.3.3")]
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error: aborting due to 2 previous errors
1414

‎tests/ui/reachable/reachable-unnameable-type-alias.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// run-pass
22

33
#![feature(staged_api)]
4-
#![stable(feature = "a", since = "b")]
4+
#![stable(feature = "a", since = "3.3.3")]
55

66
mod inner_private_module {
77
// UnnameableTypeAlias isn't marked as reachable, so no stability annotation is required here
88
pub type UnnameableTypeAlias = u8;
99
}
1010

11-
#[stable(feature = "a", since = "b")]
11+
#[stable(feature = "a", since = "3.3.3")]
1212
pub fn f() -> inner_private_module::UnnameableTypeAlias {
1313
0
1414
}

‎tests/ui/repr/16-bit-repr-c-enum.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#![feature(no_core, lang_items, intrinsics, staged_api, rustc_attrs)]
99
#![no_core]
1010
#![crate_type = "lib"]
11-
#![stable(feature = "intrinsics_for_test", since = "")]
11+
#![stable(feature = "intrinsics_for_test", since = "3.3.3")]
1212
#![allow(dead_code)]
1313

1414
// Test that the repr(C) attribute doesn't break compilation
@@ -22,8 +22,8 @@ enum Foo {
2222
}
2323

2424
extern "rust-intrinsic" {
25-
#[stable(feature = "intrinsics_for_test", since = "")]
26-
#[rustc_const_stable(feature = "intrinsics_for_test", since = "")]
25+
#[stable(feature = "intrinsics_for_test", since = "3.3.3")]
26+
#[rustc_const_stable(feature = "intrinsics_for_test", since = "3.3.3")]
2727
#[rustc_safe_intrinsic]
2828
fn size_of<T>() -> usize;
2929
}

‎tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#![feature(staged_api)]
99
#![feature(const_trait_impl)]
10-
#![stable(since = "1", feature = "foo")]
10+
#![stable(feature = "foo", since = "3.3.3")]
1111

1212
#[const_trait]
1313
trait Tr {

‎tests/ui/stability-attribute/stability-attribute-issue-43027.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// check-pass
22
#![feature(staged_api)]
3-
#![stable(feature = "test", since = "0")]
3+
#![stable(feature = "test", since = "3.3.3")]
44

5-
#[stable(feature = "test", since = "0")]
5+
#[stable(feature = "test", since = "3.3.3")]
66
pub struct A<T>(pub T);
77

8-
#[stable(feature = "test", since = "0")]
9-
pub struct B<T>(#[stable(feature = "test", since = "0")] pub T);
8+
#[stable(feature = "test", since = "3.3.3")]
9+
pub struct B<T>(#[stable(feature = "test", since = "3.3.3")] pub T);
1010

1111
fn main() {
1212
// Make sure the field is used to fill the stability cache

‎tests/ui/stability-attribute/stability-attribute-sanity-4.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ mod bogus_attribute_types_2 {
1717
#[stable = "a"] //~ ERROR malformed `stable` attribute
1818
fn f4() { }
1919

20-
#[stable(feature = "a", since = "b")]
20+
#[stable(feature = "a", since = "3.3.3")]
2121
#[deprecated] //~ ERROR missing 'since'
2222
fn f5() { }
2323

24-
#[stable(feature = "a", since = "b")]
24+
#[stable(feature = "a", since = "3.3.3")]
2525
#[deprecated = "a"] //~ ERROR missing 'since'
2626
fn f6() { }
2727
}

‎tests/ui/stability-attribute/stability-attribute-sanity.rs

+12-11
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
#![stable(feature = "rust1", since = "1.0.0")]
66

77
mod bogus_attribute_types_1 {
8-
#[stable(feature = "a", since = "b", reason)] //~ ERROR unknown meta item 'reason' [E0541]
8+
#[stable(feature = "a", since = "4.4.4", reason)] //~ ERROR unknown meta item 'reason' [E0541]
99
fn f1() { }
1010

1111
#[stable(feature = "a", since)] //~ ERROR incorrect meta item [E0539]
1212
fn f2() { }
1313

14-
#[stable(feature, since = "a")] //~ ERROR incorrect meta item [E0539]
14+
#[stable(feature, since = "3.3.3")] //~ ERROR incorrect meta item [E0539]
1515
fn f3() { }
1616

1717
#[stable(feature = "a", since(b))] //~ ERROR incorrect meta item [E0539]
1818
fn f5() { }
1919

20-
#[stable(feature(b), since = "a")] //~ ERROR incorrect meta item [E0539]
20+
#[stable(feature(b), since = "3.3.3")] //~ ERROR incorrect meta item [E0539]
2121
fn f6() { }
2222
}
2323

@@ -28,41 +28,42 @@ mod missing_feature_names {
2828
#[unstable(feature = "b")] //~ ERROR missing 'issue' [E0547]
2929
fn f2() { }
3030

31-
#[stable(since = "a")] //~ ERROR missing 'feature' [E0546]
31+
#[stable(since = "3.3.3")] //~ ERROR missing 'feature' [E0546]
3232
fn f3() { }
3333
}
3434

3535
mod missing_version {
3636
#[stable(feature = "a")] //~ ERROR missing 'since' [E0542]
3737
fn f1() { }
3838

39-
#[stable(feature = "a", since = "b")]
39+
#[stable(feature = "a", since = "4.4.4")]
4040
#[deprecated(note = "a")] //~ ERROR missing 'since' [E0542]
4141
fn f2() { }
4242

43-
#[stable(feature = "a", since = "b")]
43+
#[stable(feature = "a", since = "4.4.4")]
4444
#[deprecated(since = "a")] //~ ERROR missing 'note' [E0543]
4545
fn f3() { }
4646
}
4747

4848
#[unstable(feature = "b", issue = "none")]
49-
#[stable(feature = "a", since = "b")] //~ ERROR multiple stability levels [E0544]
49+
#[stable(feature = "a", since = "4.4.4")] //~ ERROR multiple stability levels [E0544]
5050
fn multiple1() { }
5151

5252
#[unstable(feature = "b", issue = "none")]
5353
#[unstable(feature = "b", issue = "none")] //~ ERROR multiple stability levels [E0544]
5454
fn multiple2() { }
5555

56-
#[stable(feature = "a", since = "b")]
57-
#[stable(feature = "a", since = "b")] //~ ERROR multiple stability levels [E0544]
56+
#[stable(feature = "a", since = "4.4.4")]
57+
#[stable(feature = "a", since = "4.4.4")] //~ ERROR multiple stability levels [E0544]
5858
fn multiple3() { }
5959

60-
#[stable(feature = "a", since = "b")] //~ ERROR invalid stability version found
60+
#[stable(feature = "e", since = "b")] //~ ERROR 'since' must be a Rust version number, such as "1.31.0"
6161
#[deprecated(since = "b", note = "text")]
6262
#[deprecated(since = "b", note = "text")] //~ ERROR multiple `deprecated` attributes
63+
//~^ ERROR deprecated attribute must be paired with either stable or unstable attribute
6364
#[rustc_const_unstable(feature = "c", issue = "none")]
6465
#[rustc_const_unstable(feature = "d", issue = "none")] //~ ERROR multiple stability levels
65-
pub const fn multiple4() { }
66+
pub const fn multiple4() { } //~ ERROR function has missing stability attribute
6667

6768
#[stable(feature = "a", since = "1.0.0")] //~ ERROR invalid deprecation version found
6869
//~^ ERROR feature `a` is declared stable since 1.0.0

‎tests/ui/stability-attribute/stability-attribute-sanity.stderr

+32-23
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ LL | #[deprecated(since = "b", note = "text")]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error[E0541]: unknown meta item 'reason'
14-
--> $DIR/stability-attribute-sanity.rs:8:42
14+
--> $DIR/stability-attribute-sanity.rs:8:46
1515
|
16-
LL | #[stable(feature = "a", since = "b", reason)]
17-
| ^^^^^^ expected one of `feature`, `since`
16+
LL | #[stable(feature = "a", since = "4.4.4", reason)]
17+
| ^^^^^^ expected one of `feature`, `since`
1818

1919
error[E0539]: incorrect meta item
2020
--> $DIR/stability-attribute-sanity.rs:11:29
@@ -25,7 +25,7 @@ LL | #[stable(feature = "a", since)]
2525
error[E0539]: incorrect meta item
2626
--> $DIR/stability-attribute-sanity.rs:14:14
2727
|
28-
LL | #[stable(feature, since = "a")]
28+
LL | #[stable(feature, since = "3.3.3")]
2929
| ^^^^^^^
3030

3131
error[E0539]: incorrect meta item
@@ -37,7 +37,7 @@ LL | #[stable(feature = "a", since(b))]
3737
error[E0539]: incorrect meta item
3838
--> $DIR/stability-attribute-sanity.rs:20:14
3939
|
40-
LL | #[stable(feature(b), since = "a")]
40+
LL | #[stable(feature(b), since = "3.3.3")]
4141
| ^^^^^^^^^^
4242

4343
error[E0546]: missing 'feature'
@@ -55,8 +55,8 @@ LL | #[unstable(feature = "b")]
5555
error[E0546]: missing 'feature'
5656
--> $DIR/stability-attribute-sanity.rs:31:5
5757
|
58-
LL | #[stable(since = "a")]
59-
| ^^^^^^^^^^^^^^^^^^^^^^
58+
LL | #[stable(since = "3.3.3")]
59+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
6060

6161
error[E0542]: missing 'since'
6262
--> $DIR/stability-attribute-sanity.rs:36:5
@@ -79,8 +79,8 @@ LL | #[deprecated(since = "a")]
7979
error[E0544]: multiple stability levels
8080
--> $DIR/stability-attribute-sanity.rs:49:1
8181
|
82-
LL | #[stable(feature = "a", since = "b")]
83-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
82+
LL | #[stable(feature = "a", since = "4.4.4")]
83+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8484

8585
error[E0544]: multiple stability levels
8686
--> $DIR/stability-attribute-sanity.rs:53:1
@@ -91,26 +91,29 @@ LL | #[unstable(feature = "b", issue = "none")]
9191
error[E0544]: multiple stability levels
9292
--> $DIR/stability-attribute-sanity.rs:57:1
9393
|
94-
LL | #[stable(feature = "a", since = "b")]
94+
LL | #[stable(feature = "a", since = "4.4.4")]
95+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
96+
97+
error: 'since' must be a Rust version number, such as "1.31.0"
98+
--> $DIR/stability-attribute-sanity.rs:60:1
99+
|
100+
LL | #[stable(feature = "e", since = "b")]
95101
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
96102

97103
error[E0544]: multiple stability levels
98-
--> $DIR/stability-attribute-sanity.rs:64:1
104+
--> $DIR/stability-attribute-sanity.rs:65:1
99105
|
100106
LL | #[rustc_const_unstable(feature = "d", issue = "none")]
101107
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
102108

103-
error: invalid stability version found
104-
--> $DIR/stability-attribute-sanity.rs:60:1
109+
error[E0549]: deprecated attribute must be paired with either stable or unstable attribute
110+
--> $DIR/stability-attribute-sanity.rs:62:1
105111
|
106-
LL | #[stable(feature = "a", since = "b")]
107-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid stability version
108-
...
109-
LL | pub const fn multiple4() { }
110-
| ---------------------------- the stability attribute annotates this item
112+
LL | #[deprecated(since = "b", note = "text")]
113+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
111114

112115
error: invalid deprecation version found
113-
--> $DIR/stability-attribute-sanity.rs:67:1
116+
--> $DIR/stability-attribute-sanity.rs:68:1
114117
|
115118
LL | #[stable(feature = "a", since = "1.0.0")]
116119
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid deprecation version
@@ -119,18 +122,24 @@ LL | fn invalid_deprecation_version() {}
119122
| ----------------------------------- the stability attribute annotates this item
120123

121124
error[E0549]: deprecated attribute must be paired with either stable or unstable attribute
122-
--> $DIR/stability-attribute-sanity.rs:72:1
125+
--> $DIR/stability-attribute-sanity.rs:73:1
123126
|
124127
LL | #[deprecated(since = "a", note = "text")]
125128
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
126129

127-
error[E0711]: feature `a` is declared stable since 1.0.0, but was previously declared stable since b
128-
--> $DIR/stability-attribute-sanity.rs:67:1
130+
error: function has missing stability attribute
131+
--> $DIR/stability-attribute-sanity.rs:66:1
132+
|
133+
LL | pub const fn multiple4() { }
134+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
135+
136+
error[E0711]: feature `a` is declared stable since 1.0.0, but was previously declared stable since 4.4.4
137+
--> $DIR/stability-attribute-sanity.rs:68:1
129138
|
130139
LL | #[stable(feature = "a", since = "1.0.0")]
131140
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
132141

133-
error: aborting due to 20 previous errors
142+
error: aborting due to 22 previous errors
134143

135144
Some errors have detailed explanations: E0539, E0541, E0542, E0543, E0544, E0546, E0547, E0549, E0711.
136145
For more information about an error, try `rustc --explain E0539`.

‎tests/ui/stability-attribute/stability-attribute-trait-impl.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#![feature(staged_api, never_type, rust_cold_cc)]
22
//~^ ERROR module has missing stability attribute
33

4-
#[stable(feature = "a", since = "1")]
4+
#[stable(feature = "a", since = "3.3.3")]
55
struct StableType;
66

77
#[unstable(feature = "b", issue = "none")]
88
struct UnstableType;
99

10-
#[stable(feature = "c", since = "1")]
10+
#[stable(feature = "c", since = "3.3.3")]
1111
trait StableTrait {}
1212

1313
#[unstable(feature = "d", issue = "none")]

‎tests/ui/stability-attribute/stability-attribute-trait-impl.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ error: module has missing stability attribute
2121
LL | / #![feature(staged_api, never_type, rust_cold_cc)]
2222
LL | |
2323
LL | |
24-
LL | | #[stable(feature = "a", since = "1")]
24+
LL | | #[stable(feature = "a", since = "3.3.3")]
2525
... |
2626
LL | |
2727
LL | | fn main() {}

0 commit comments

Comments
 (0)