Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace "feature gated" wording with "unstable". #64263

Merged
merged 1 commit into from
Sep 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/librustc_metadata/native_libs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,15 @@ impl Collector<'tcx> {
sym::link_cfg,
span.unwrap(),
GateIssue::Language,
"is feature gated");
"is unstable");
}
if lib.kind == cstore::NativeStaticNobundle &&
!self.tcx.features().static_nobundle {
feature_gate::emit_feature_err(&self.tcx.sess.parse_sess,
sym::static_nobundle,
span.unwrap_or_else(|| syntax_pos::DUMMY_SP),
GateIssue::Language,
"kind=\"static-nobundle\" is feature gated");
"kind=\"static-nobundle\" is unstable");
}
self.libs.push(lib);
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/attributes/obsolete-attr.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Obsolete attributes fall back to feature gated custom attributes.
// Obsolete attributes fall back to unstable custom attributes.

#[ab_isize="stdcall"] extern {}
//~^ ERROR cannot find attribute macro `ab_isize` in this scope
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/attributes/unknown-attr.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Unknown attributes fall back to feature gated custom attributes.
// Unknown attributes fall back to unstable custom attributes.

#![feature(custom_inner_attributes)]

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/feature-gate/feature-gate-static-nobundle-2.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//~ ERROR kind="static-nobundle" is feature gated
//~ ERROR kind="static-nobundle" is unstable
// Test the behavior of rustc when non-existent library is statically linked

// compile-flags: -l static-nobundle=nonexistent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error[E0658]: kind="static-nobundle" is feature gated
error[E0658]: kind="static-nobundle" is unstable
|
= note: for more information, see https://github.com/rust-lang/rust/issues/37403
= help: add `#![feature(static_nobundle)]` to the crate attributes to enable
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/feature-gates/feature-gate-is_sorted.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
fn main() {
// Assert `Iterator` methods are feature gated
// Assert `Iterator` methods are unstable
assert!([1, 2, 2, 9].iter().is_sorted());
//~^ ERROR: use of unstable library feature 'is_sorted': new API
assert!(![-2i32, -1, 0, 3].iter().is_sorted_by_key(|n| n.abs()));
//~^ ERROR: use of unstable library feature 'is_sorted': new API

// Assert `[T]` methods are feature gated
// Assert `[T]` methods are unstable
assert!([1, 2, 2, 9].is_sorted());
//~^ ERROR: use of unstable library feature 'is_sorted': new API
assert!(![-2i32, -1, 0, 3].is_sorted_by_key(|n| n.abs()));
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/feature-gates/feature-gate-link_cfg.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#[link(name = "foo", cfg(foo))]
//~^ ERROR: is feature gated
//~^ ERROR: is unstable
extern {}

fn main() {}
2 changes: 1 addition & 1 deletion src/test/ui/feature-gates/feature-gate-link_cfg.stderr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error[E0658]: is feature gated
error[E0658]: is unstable
--> $DIR/feature-gate-link_cfg.rs:1:1
|
LL | #[link(name = "foo", cfg(foo))]
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/feature-gates/feature-gate-static-nobundle.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#[link(name="foo", kind="static-nobundle")]
//~^ ERROR: kind="static-nobundle" is feature gated
//~^ ERROR: kind="static-nobundle" is unstable
extern {}

fn main() {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error[E0658]: kind="static-nobundle" is feature gated
error[E0658]: kind="static-nobundle" is unstable
--> $DIR/feature-gate-static-nobundle.rs:1:1
|
LL | #[link(name="foo", kind="static-nobundle")]
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/feature-gates/feature-gate-type_ascription.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Type ascription is feature gated
// Type ascription is unstable

fn main() {
let a = 10: u8; //~ ERROR type ascription is experimental
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/proc-macro/resolve-error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ macro_rules! attr_proc_mac {
//~^ ERROR cannot find
struct Foo;

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

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

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ type B = rustfmt::skip; //~ ERROR expected type, found tool attribute `rustfmt::
#[derive(rustfmt)] //~ ERROR cannot find derive macro `rustfmt` in this scope
struct S;

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

Expand Down