Skip to content

Commit 7cfad41

Browse files
authored
Rollup merge of #64263 - crlf0710:improve_wording, r=petrochenkov
Replace "feature gated" wording with "unstable".
2 parents 510976b + 8acab6b commit 7cfad41

13 files changed

+16
-16
lines changed

src/librustc_metadata/native_libs.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,15 @@ impl Collector<'tcx> {
159159
sym::link_cfg,
160160
span.unwrap(),
161161
GateIssue::Language,
162-
"is feature gated");
162+
"is unstable");
163163
}
164164
if lib.kind == cstore::NativeStaticNobundle &&
165165
!self.tcx.features().static_nobundle {
166166
feature_gate::emit_feature_err(&self.tcx.sess.parse_sess,
167167
sym::static_nobundle,
168168
span.unwrap_or_else(|| syntax_pos::DUMMY_SP),
169169
GateIssue::Language,
170-
"kind=\"static-nobundle\" is feature gated");
170+
"kind=\"static-nobundle\" is unstable");
171171
}
172172
self.libs.push(lib);
173173
}

src/test/ui/attributes/obsolete-attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Obsolete attributes fall back to feature gated custom attributes.
1+
// Obsolete attributes fall back to unstable custom attributes.
22

33
#[ab_isize="stdcall"] extern {}
44
//~^ ERROR cannot find attribute macro `ab_isize` in this scope

src/test/ui/attributes/unknown-attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Unknown attributes fall back to feature gated custom attributes.
1+
// Unknown attributes fall back to unstable custom attributes.
22

33
#![feature(custom_inner_attributes)]
44

src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//~ ERROR kind="static-nobundle" is feature gated
1+
//~ ERROR kind="static-nobundle" is unstable
22
// Test the behavior of rustc when non-existent library is statically linked
33

44
// compile-flags: -l static-nobundle=nonexistent

src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0658]: kind="static-nobundle" is feature gated
1+
error[E0658]: kind="static-nobundle" is unstable
22
|
33
= note: for more information, see https://github.com/rust-lang/rust/issues/37403
44
= help: add `#![feature(static_nobundle)]` to the crate attributes to enable

src/test/ui/feature-gates/feature-gate-is_sorted.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
fn main() {
2-
// Assert `Iterator` methods are feature gated
2+
// Assert `Iterator` methods are unstable
33
assert!([1, 2, 2, 9].iter().is_sorted());
44
//~^ ERROR: use of unstable library feature 'is_sorted': new API
55
assert!(![-2i32, -1, 0, 3].iter().is_sorted_by_key(|n| n.abs()));
66
//~^ ERROR: use of unstable library feature 'is_sorted': new API
77

8-
// Assert `[T]` methods are feature gated
8+
// Assert `[T]` methods are unstable
99
assert!([1, 2, 2, 9].is_sorted());
1010
//~^ ERROR: use of unstable library feature 'is_sorted': new API
1111
assert!(![-2i32, -1, 0, 3].is_sorted_by_key(|n| n.abs()));
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[link(name = "foo", cfg(foo))]
2-
//~^ ERROR: is feature gated
2+
//~^ ERROR: is unstable
33
extern {}
44

55
fn main() {}

src/test/ui/feature-gates/feature-gate-link_cfg.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0658]: is feature gated
1+
error[E0658]: is unstable
22
--> $DIR/feature-gate-link_cfg.rs:1:1
33
|
44
LL | #[link(name = "foo", cfg(foo))]
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[link(name="foo", kind="static-nobundle")]
2-
//~^ ERROR: kind="static-nobundle" is feature gated
2+
//~^ ERROR: kind="static-nobundle" is unstable
33
extern {}
44

55
fn main() {}

src/test/ui/feature-gates/feature-gate-static-nobundle.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0658]: kind="static-nobundle" is feature gated
1+
error[E0658]: kind="static-nobundle" is unstable
22
--> $DIR/feature-gate-static-nobundle.rs:1:1
33
|
44
LL | #[link(name="foo", kind="static-nobundle")]

src/test/ui/feature-gates/feature-gate-type_ascription.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Type ascription is feature gated
1+
// Type ascription is unstable
22

33
fn main() {
44
let a = 10: u8; //~ ERROR type ascription is experimental

src/test/ui/proc-macro/resolve-error.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ macro_rules! attr_proc_mac {
2323
//~^ ERROR cannot find
2424
struct Foo;
2525

26-
// Interpreted as a feature gated custom attribute
26+
// Interpreted as an unstable custom attribute
2727
#[attr_proc_macra] //~ ERROR cannot find attribute macro `attr_proc_macra` in this scope
2828
struct Bar;
2929

30-
// Interpreted as a feature gated custom attribute
30+
// Interpreted as an unstable custom attribute
3131
#[FooWithLongNan] //~ ERROR cannot find attribute macro `FooWithLongNan` in this scope
3232
struct Asdf;
3333

src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ type B = rustfmt::skip; //~ ERROR expected type, found tool attribute `rustfmt::
44
#[derive(rustfmt)] //~ ERROR cannot find derive macro `rustfmt` in this scope
55
struct S;
66

7-
// Interpreted as a feature gated custom attribute
7+
// Interpreted as an unstable custom attribute
88
#[rustfmt] //~ ERROR cannot find attribute macro `rustfmt` in this scope
99
fn check() {}
1010

0 commit comments

Comments
 (0)