Skip to content

Commit 299d696

Browse files
c410-f3rc410-f3r
committed
Stabilize param_attrs in Rust 1.39.0
1 parent 34e82a7 commit 299d696

23 files changed

+93
-204
lines changed

‎src/doc/unstable-book/src/language-features/param-attrs.md

-27
This file was deleted.

‎src/libsyntax/feature_gate/accepted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ declare_features! (
243243
(accepted, async_await, "1.39.0", Some(50547), None),
244244
/// Allows mixing bind-by-move in patterns and references to those identifiers in guards.
245245
(accepted, bind_by_move_pattern_guards, "1.39.0", Some(15287), None),
246+
/// Allows attributes in formal function parameters.
247+
(accepted, param_attrs, "1.39.0", Some(60406), None),
246248

247249
// -------------------------------------------------------------------------
248250
// feature-group-end: accepted features

‎src/libsyntax/feature_gate/active.rs

-3
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,6 @@ declare_features! (
489489
/// Allows the user of associated type bounds.
490490
(active, associated_type_bounds, "1.34.0", Some(52662), None),
491491

492-
/// Attributes on formal function params.
493-
(active, param_attrs, "1.36.0", Some(60406), None),
494-
495492
/// Allows calling constructor functions in `const fn`.
496493
(active, const_constructor, "1.37.0", Some(61456), None),
497494

‎src/libsyntax/feature_gate/check.rs

-1
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,6 @@ pub fn check_crate(krate: &ast::Crate,
892892
}
893893
}
894894

895-
gate_all!(param_attrs, "attributes on function parameters are unstable");
896895
gate_all!(let_chains, "`let` expressions in this position are experimental");
897896
gate_all!(async_closure, "async closures are unstable");
898897
gate_all!(yields, generators, "yield syntax is experimental");

‎src/libsyntax/parse/attr.rs

-7
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@ const DEFAULT_UNEXPECTED_INNER_ATTR_ERR_MSG: &str = "an inner attribute is not \
1919
permitted in this context";
2020

2121
impl<'a> Parser<'a> {
22-
crate fn parse_param_attributes(&mut self) -> PResult<'a, Vec<ast::Attribute>> {
23-
let attrs = self.parse_outer_attributes()?;
24-
self.sess.gated_spans.param_attrs.borrow_mut()
25-
.extend(attrs.iter().map(|a| a.span));
26-
Ok(attrs)
27-
}
28-
2922
/// Parses attributes that appear before an item.
3023
crate fn parse_outer_attributes(&mut self) -> PResult<'a, Vec<ast::Attribute>> {
3124
let mut attrs: Vec<ast::Attribute> = Vec::new();

‎src/libsyntax/parse/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ pub type PResult<'a, T> = Result<T, DiagnosticBuilder<'a>>;
4242
/// used and should be feature gated accordingly in `check_crate`.
4343
#[derive(Default)]
4444
pub struct GatedSpans {
45-
/// Spans collected for gating `param_attrs`, e.g. `fn foo(#[attr] x: u8) {}`.
46-
pub param_attrs: Lock<Vec<Span>>,
4745
/// Spans collected for gating `let_chains`, e.g. `if a && let b = c {}`.
4846
pub let_chains: Lock<Vec<Span>>,
4947
/// Spans collected for gating `async_closure`, e.g. `async || ..`.

‎src/libsyntax/parse/parser.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ impl<'a> Parser<'a> {
979979
is_name_required: impl Fn(&token::Token) -> bool,
980980
) -> PResult<'a, Param> {
981981
let lo = self.token.span;
982-
let attrs = self.parse_param_attributes()?;
982+
let attrs = self.parse_outer_attributes()?;
983983
if let Some(mut param) = self.parse_self_param()? {
984984
param.attrs = attrs.into();
985985
return self.recover_bad_self_param(param, is_trait_item);
@@ -1362,7 +1362,7 @@ impl<'a> Parser<'a> {
13621362
/// Returns the parsed optional self parameter with attributes and whether a self
13631363
/// shortcut was used.
13641364
fn parse_self_parameter_with_attrs(&mut self) -> PResult<'a, Option<Param>> {
1365-
let attrs = self.parse_param_attributes()?;
1365+
let attrs = self.parse_outer_attributes()?;
13661366
let param_opt = self.parse_self_param()?;
13671367
Ok(param_opt.map(|mut param| {
13681368
param.attrs = attrs.into();

‎src/libsyntax/parse/parser/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1176,7 +1176,7 @@ impl<'a> Parser<'a> {
11761176
/// Parses a parameter in a closure header (e.g., `|arg, arg|`).
11771177
fn parse_fn_block_param(&mut self) -> PResult<'a, Param> {
11781178
let lo = self.token.span;
1179-
let attrs = self.parse_param_attributes()?;
1179+
let attrs = self.parse_outer_attributes()?;
11801180
let pat = self.parse_pat(PARAM_EXPECTED)?;
11811181
let t = if self.eat(&token::Colon) {
11821182
self.parse_ty()?

‎src/test/ui/lint/lint-unused-mut-variables.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Exercise the unused_mut attribute in some positive and negative cases
44

55
#![deny(unused_mut)]
6-
#![feature(async_closure, param_attrs)]
6+
#![feature(async_closure)]
77

88
async fn baz_async(
99
mut a: i32,

‎src/test/ui/lint/lint-unused-variables.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// compile-flags: --cfg something
22
// edition:2018
33

4-
#![feature(async_closure, param_attrs)]
4+
#![feature(async_closure)]
55
#![deny(unused_variables)]
66

77
async fn foo_async(

‎src/test/ui/parser/fn-arg-doc-comment.rs

-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@ pub fn f(
22
/// Comment
33
//~^ ERROR documentation comments cannot be applied to function parameters
44
//~| NOTE doc comments are not allowed here
5-
//~| ERROR attributes on function parameters are unstable
6-
//~| NOTE https://github.com/rust-lang/rust/issues/60406
75
id: u8,
86
/// Other
97
//~^ ERROR documentation comments cannot be applied to function parameters
108
//~| NOTE doc comments are not allowed here
11-
//~| ERROR attributes on function parameters are unstable
12-
//~| NOTE https://github.com/rust-lang/rust/issues/60406
139
a: u8,
1410
) {}
1511

‎src/test/ui/parser/fn-arg-doc-comment.stderr

+7-26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: attributes cannot be applied to a function parameter's type
2-
--> $DIR/fn-arg-doc-comment.rs:16:12
2+
--> $DIR/fn-arg-doc-comment.rs:12:12
33
|
44
LL | fn bar(id: #[allow(dead_code)] i32) {}
55
| ^^^^^^^^^^^^^^^^^^^ attributes are not allowed here
@@ -11,31 +11,13 @@ LL | /// Comment
1111
| ^^^^^^^^^^^ doc comments are not allowed here
1212

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

19-
error[E0658]: attributes on function parameters are unstable
20-
--> $DIR/fn-arg-doc-comment.rs:2:5
21-
|
22-
LL | /// Comment
23-
| ^^^^^^^^^^^
24-
|
25-
= note: for more information, see https://github.com/rust-lang/rust/issues/60406
26-
= help: add `#![feature(param_attrs)]` to the crate attributes to enable
27-
28-
error[E0658]: attributes on function parameters are unstable
29-
--> $DIR/fn-arg-doc-comment.rs:8:5
30-
|
31-
LL | /// Other
32-
| ^^^^^^^^^
33-
|
34-
= note: for more information, see https://github.com/rust-lang/rust/issues/60406
35-
= help: add `#![feature(param_attrs)]` to the crate attributes to enable
36-
3719
error[E0308]: mismatched types
38-
--> $DIR/fn-arg-doc-comment.rs:22:7
20+
--> $DIR/fn-arg-doc-comment.rs:18:7
3921
|
4022
LL | f("", "");
4123
| ^^ expected u8, found reference
@@ -44,7 +26,7 @@ LL | f("", "");
4426
found type `&'static str`
4527

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

5537
error[E0308]: mismatched types
56-
--> $DIR/fn-arg-doc-comment.rs:29:9
38+
--> $DIR/fn-arg-doc-comment.rs:25:9
5739
|
5840
LL | bar("");
5941
| ^^ expected i32, found reference
6042
|
6143
= note: expected type `i32`
6244
found type `&'static str`
6345

64-
error: aborting due to 8 previous errors
46+
error: aborting due to 6 previous errors
6547

66-
Some errors have detailed explanations: E0308, E0658.
67-
For more information about an error, try `rustc --explain E0308`.
48+
For more information about this error, try `rustc --explain E0308`.

‎src/test/ui/rfc-2565-param-attrs/param-attrs-2018.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// edition:2018
22

3-
#![feature(param_attrs)]
4-
53
trait Trait2015 { fn foo(#[allow(C)] i32); }
64
//~^ ERROR expected one of `:`, `@`, or `|`, found `)`
75

‎src/test/ui/rfc-2565-param-attrs/param-attrs-2018.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected one of `:`, `@`, or `|`, found `)`
2-
--> $DIR/param-attrs-2018.rs:5:41
2+
--> $DIR/param-attrs-2018.rs:3:41
33
|
44
LL | trait Trait2015 { fn foo(#[allow(C)] i32); }
55
| ^ expected one of `:`, `@`, or `|` here

‎src/test/ui/rfc-2565-param-attrs/param-attrs-allowed.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// compile-flags: --cfg something
33

44
#![deny(unused_mut)]
5-
#![feature(param_attrs)]
65

76
extern "C" {
87
fn ffi(

‎src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(param_attrs)]
2-
31
extern "C" {
42
fn ffi(
53
/// Foo

0 commit comments

Comments
 (0)