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

Stabilize param_attrs in Rust 1.39.0 #1

Closed
wants to merge 1 commit into from
Closed
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
27 changes: 0 additions & 27 deletions src/doc/unstable-book/src/language-features/param-attrs.md

This file was deleted.

6 changes: 2 additions & 4 deletions src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,9 +523,6 @@ declare_features! (
// Allows the user of associated type bounds.
(active, associated_type_bounds, "1.34.0", Some(52662), None),

// Attributes on formal function params.
(active, param_attrs, "1.36.0", Some(60406), None),

// Allows calling constructor functions in `const fn`.
(active, const_constructor, "1.37.0", Some(61456), None),

Expand Down Expand Up @@ -856,6 +853,8 @@ declare_features! (
(accepted, underscore_const_names, "1.37.0", Some(54912), None),
// Allows free and inherent `async fn`s, `async` blocks, and `<expr>.await` expressions.
(accepted, async_await, "1.39.0", Some(50547), None),
// Attributes on formal function params.
(accepted, param_attrs, "1.39.0", Some(60406), None),

// -------------------------------------------------------------------------
// feature-group-end: accepted features
Expand Down Expand Up @@ -2431,7 +2430,6 @@ pub fn check_crate(krate: &ast::Crate,
}
}

gate_all!(param_attrs, "attributes on function parameters are unstable");
gate_all!(let_chains, "`let` expressions in this position are experimental");
gate_all!(async_closure, "async closures are unstable");
gate_all!(yields, generators, "yield syntax is experimental");
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/lint/lint-unused-mut-variables.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Exercise the unused_mut attribute in some positive and negative cases

#![deny(unused_mut)]
#![feature(async_closure, param_attrs)]
#![feature(async_closure)]

async fn baz_async(
mut a: i32,
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/lint/lint-unused-variables.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// compile-flags: --cfg something
// edition:2018

#![feature(async_closure, param_attrs)]
#![feature(async_closure)]
#![deny(unused_variables)]

async fn foo_async(
Expand Down
4 changes: 0 additions & 4 deletions src/test/ui/parser/fn-arg-doc-comment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@ pub fn f(
/// Comment
//~^ ERROR documentation comments cannot be applied to function parameters
//~| NOTE doc comments are not allowed here
//~| ERROR attributes on function parameters are unstable
//~| NOTE https://github.com/rust-lang/rust/issues/60406
id: u8,
/// Other
//~^ ERROR documentation comments cannot be applied to function parameters
//~| NOTE doc comments are not allowed here
//~| ERROR attributes on function parameters are unstable
//~| NOTE https://github.com/rust-lang/rust/issues/60406
a: u8,
) {}

Expand Down
33 changes: 7 additions & 26 deletions src/test/ui/parser/fn-arg-doc-comment.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: attributes cannot be applied to a function parameter's type
--> $DIR/fn-arg-doc-comment.rs:16:12
--> $DIR/fn-arg-doc-comment.rs:12:12
|
LL | fn bar(id: #[allow(dead_code)] i32) {}
| ^^^^^^^^^^^^^^^^^^^ attributes are not allowed here
Expand All @@ -11,31 +11,13 @@ LL | /// Comment
| ^^^^^^^^^^^ doc comments are not allowed here

error: documentation comments cannot be applied to function parameters
--> $DIR/fn-arg-doc-comment.rs:8:5
--> $DIR/fn-arg-doc-comment.rs:6:5
|
LL | /// Other
| ^^^^^^^^^ doc comments are not allowed here

error[E0658]: attributes on function parameters are unstable
--> $DIR/fn-arg-doc-comment.rs:2:5
|
LL | /// Comment
| ^^^^^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/60406
= help: add `#![feature(param_attrs)]` to the crate attributes to enable

error[E0658]: attributes on function parameters are unstable
--> $DIR/fn-arg-doc-comment.rs:8:5
|
LL | /// Other
| ^^^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/60406
= help: add `#![feature(param_attrs)]` to the crate attributes to enable

error[E0308]: mismatched types
--> $DIR/fn-arg-doc-comment.rs:22:7
--> $DIR/fn-arg-doc-comment.rs:18:7
|
LL | f("", "");
| ^^ expected u8, found reference
Expand All @@ -44,7 +26,7 @@ LL | f("", "");
found type `&'static str`

error[E0308]: mismatched types
--> $DIR/fn-arg-doc-comment.rs:22:11
--> $DIR/fn-arg-doc-comment.rs:18:11
|
LL | f("", "");
| ^^ expected u8, found reference
Expand All @@ -53,15 +35,14 @@ LL | f("", "");
found type `&'static str`

error[E0308]: mismatched types
--> $DIR/fn-arg-doc-comment.rs:29:9
--> $DIR/fn-arg-doc-comment.rs:25:9
|
LL | bar("");
| ^^ expected i32, found reference
|
= note: expected type `i32`
found type `&'static str`

error: aborting due to 8 previous errors
error: aborting due to 6 previous errors

Some errors have detailed explanations: E0308, E0658.
For more information about an error, try `rustc --explain E0308`.
For more information about this error, try `rustc --explain E0308`.
2 changes: 0 additions & 2 deletions src/test/ui/rfc-2565-param-attrs/param-attrs-2018.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// edition:2018

#![feature(param_attrs)]

trait Trait2015 { fn foo(#[allow(C)] i32); }
//~^ ERROR expected one of `:` or `@`, found `)`

Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/rfc-2565-param-attrs/param-attrs-2018.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: expected one of `:` or `@`, found `)`
--> $DIR/param-attrs-2018.rs:5:41
--> $DIR/param-attrs-2018.rs:3:41
|
LL | trait Trait2015 { fn foo(#[allow(C)] i32); }
| ^ expected one of `:` or `@` here
Expand Down
1 change: 0 additions & 1 deletion src/test/ui/rfc-2565-param-attrs/param-attrs-allowed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// compile-flags: --cfg something

#![deny(unused_mut)]
#![feature(param_attrs)]

extern "C" {
fn ffi(
Expand Down
2 changes: 0 additions & 2 deletions src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(param_attrs)]

extern "C" {
fn ffi(
/// Foo
Expand Down
Loading