Skip to content

Commit ed0bd38

Browse files
SergioBenitezSergioBenitez
committed
Stabilize 'attr_literals' feature.
1 parent 5ce5e08 commit ed0bd38

28 files changed

+42
-252
lines changed

‎src/doc/unstable-book/src/language-features/attr-literals.md

-30
This file was deleted.

‎src/liballoc/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#![feature(allocator_api)]
1212
#![feature(alloc_system)]
13-
#![feature(attr_literals)]
1413
#![feature(box_syntax)]
1514
#![feature(const_fn)]
1615
#![feature(drain_filter)]

‎src/libcore/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
#![feature(arbitrary_self_types)]
7878
#![feature(asm)]
7979
#![feature(associated_type_defaults)]
80-
#![feature(attr_literals)]
8180
#![feature(cfg_target_has_atomic)]
8281
#![feature(concat_idents)]
8382
#![feature(const_fn)]

‎src/librustc_typeck/diagnostics.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4630,7 +4630,7 @@ field that requires non-trivial alignment.
46304630
Erroneous code example:
46314631
46324632
```compile_fail,E0691
4633-
#![feature(repr_align, attr_literals)]
4633+
#![feature(repr_align)]
46344634
46354635
#[repr(align(32))]
46364636
struct ForceAlign32;
@@ -4657,7 +4657,7 @@ Alternatively, `PhantomData<T>` has alignment 1 for all `T`, so you can use it
46574657
if you need to keep the field for some reason:
46584658
46594659
```
4660-
#![feature(repr_align, attr_literals)]
4660+
#![feature(repr_align)]
46614661
46624662
use std::marker::PhantomData;
46634663

‎src/libstd/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@
244244
#![feature(arbitrary_self_types)]
245245
#![feature(array_error_internals)]
246246
#![feature(asm)]
247-
#![feature(attr_literals)]
248247
#![feature(box_syntax)]
249248
#![feature(cfg_target_has_atomic)]
250249
#![feature(cfg_target_thread_local)]

‎src/libsyntax/diagnostic_list.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -213,19 +213,18 @@ Delete the offending feature attribute.
213213
"##,
214214

215215
E0565: r##"
216-
A literal was used in an attribute that doesn't support literals.
216+
A literal was used in a built-in attribute that doesn't support literals.
217217
218218
Erroneous code example:
219219
220220
```ignore (compile_fail not working here; see Issue #43707)
221-
#![feature(attr_literals)]
222-
223221
#[inline("always")] // error: unsupported literal
224222
pub fn something() {}
225223
```
226224
227-
Literals in attributes are new and largely unsupported. Work to support literals
228-
where appropriate is ongoing. Try using an unquoted name instead:
225+
Literals in attributes are new and largely unsupported in built-in attributes.
226+
Work to support literals where appropriate is ongoing. Try using an unquoted
227+
name instead:
229228
230229
```
231230
#[inline(always)]

‎src/libsyntax/feature_gate.rs

+7-41
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,6 @@ declare_features! (
289289
// Allows exhaustive pattern matching on types that contain uninhabited types
290290
(active, exhaustive_patterns, "1.13.0", Some(51085), None),
291291

292-
// Allows all literals in attribute lists and values of key-value pairs
293-
(active, attr_literals, "1.13.0", Some(34981), None),
294-
295292
// Allows untagged unions `union U { ... }`
296293
(active, untagged_unions, "1.13.0", Some(32836), None),
297294

@@ -654,6 +651,8 @@ declare_features! (
654651
(accepted, tool_attributes, "1.30.0", Some(44690), None),
655652
// Allows multi-segment paths in attributes and derives
656653
(accepted, proc_macro_path_invoc, "1.30.0", Some(38356), None),
654+
// Allows all literals in attribute lists and values of key-value pairs.
655+
(accepted, attr_literals, "1.30.0", Some(34981), None),
657656
);
658657

659658
// If you change this, please modify src/doc/unstable-book as well. You must
@@ -1451,22 +1450,6 @@ impl<'a> PostExpansionVisitor<'a> {
14511450
}
14521451
}
14531452

1454-
fn contains_novel_literal(item: &ast::MetaItem) -> bool {
1455-
use ast::MetaItemKind::*;
1456-
use ast::NestedMetaItemKind::*;
1457-
1458-
match item.node {
1459-
Word => false,
1460-
NameValue(ref lit) => !lit.node.is_str(),
1461-
List(ref list) => list.iter().any(|li| {
1462-
match li.node {
1463-
MetaItem(ref mi) => contains_novel_literal(mi),
1464-
Literal(_) => true,
1465-
}
1466-
}),
1467-
}
1468-
}
1469-
14701453
impl<'a> PostExpansionVisitor<'a> {
14711454
fn whole_crate_feature_gates(&mut self, _krate: &ast::Crate) {
14721455
for &(ident, span) in &*self.context.parse_sess.non_modrs_mods.borrow() {
@@ -1526,28 +1509,11 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
15261509
}
15271510

15281511
if !self.context.features.unrestricted_attribute_tokens {
1529-
// Unfortunately, `parse_meta` cannot be called speculatively because it can report
1530-
// errors by itself, so we have to call it only if the feature is disabled.
1531-
match attr.parse_meta(self.context.parse_sess) {
1532-
Ok(meta) => {
1533-
// allow attr_literals in #[repr(align(x))] and #[repr(packed(n))]
1534-
let mut allow_attr_literal = false;
1535-
if attr.path == "repr" {
1536-
if let Some(content) = meta.meta_item_list() {
1537-
allow_attr_literal = content.iter().any(
1538-
|c| c.check_name("align") || c.check_name("packed"));
1539-
}
1540-
}
1541-
1542-
if !allow_attr_literal && contains_novel_literal(&meta) {
1543-
gate_feature_post!(&self, attr_literals, attr.span,
1544-
"non-string literals in attributes, or string \
1545-
literals in top-level positions, are experimental");
1546-
}
1547-
}
1548-
Err(mut err) => {
1549-
err.help("try enabling `#![feature(unrestricted_attribute_tokens)]`").emit()
1550-
}
1512+
// Unfortunately, `parse_meta` cannot be called speculatively
1513+
// because it can report errors by itself, so we have to call it
1514+
// only if the feature is disabled.
1515+
if let Err(mut err) = attr.parse_meta(self.context.parse_sess) {
1516+
err.help("try enabling `#![feature(unrestricted_attribute_tokens)]`").emit()
15511517
}
15521518
}
15531519
}

‎src/test/pretty/attr-literals.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// pp-exact
1212
// Tests literals in attributes.
1313

14-
#![feature(custom_attribute, attr_literals)]
14+
#![feature(custom_attribute)]
1515

1616
fn main() {
1717
#![hello("hi", 1, 2, 1.012, pi = 3.14, bye, name("John"))]

‎src/test/run-pass-fulldeps/macro-crate-multi-decorator-literals.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// aux-build:macro_crate_test.rs
1212
// ignore-stage1
1313

14-
#![feature(plugin, rustc_attrs, attr_literals)]
14+
#![feature(plugin, rustc_attrs)]
1515
#![plugin(macro_crate_test)]
1616

1717
#[macro_use]

‎src/test/run-pass/align-with-extern-c-fn.rs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
// #45662
1212

1313
#![feature(repr_align)]
14-
#![feature(attr_literals)]
1514

1615
#[repr(align(16))]
1716
pub struct A(i64);

‎src/test/ui/attr-usage-repr.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(attr_literals)]
1211
#![feature(repr_simd)]
1312

1413
#[repr(C)] //~ ERROR: attribute should be applied to struct, enum or union

‎src/test/ui/attr-usage-repr.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
error[E0517]: attribute should be applied to struct, enum or union
2-
--> $DIR/attr-usage-repr.rs:14:8
2+
--> $DIR/attr-usage-repr.rs:13:8
33
|
44
LL | #[repr(C)] //~ ERROR: attribute should be applied to struct, enum or union
55
| ^
66
LL | fn f() {}
77
| --------- not a struct, enum or union
88

99
error[E0517]: attribute should be applied to enum
10-
--> $DIR/attr-usage-repr.rs:26:8
10+
--> $DIR/attr-usage-repr.rs:25:8
1111
|
1212
LL | #[repr(i8)] //~ ERROR: attribute should be applied to enum
1313
| ^^
1414
LL | struct SInt(f64, f64);
1515
| ---------------------- not an enum
1616

1717
error[E0517]: attribute should be applied to struct or union
18-
--> $DIR/attr-usage-repr.rs:32:8
18+
--> $DIR/attr-usage-repr.rs:31:8
1919
|
2020
LL | #[repr(align(8))] //~ ERROR: attribute should be applied to struct
2121
| ^^^^^^^^
2222
LL | enum EAlign { A, B }
2323
| -------------------- not a struct or union
2424

2525
error[E0517]: attribute should be applied to struct or union
26-
--> $DIR/attr-usage-repr.rs:35:8
26+
--> $DIR/attr-usage-repr.rs:34:8
2727
|
2828
LL | #[repr(packed)] //~ ERROR: attribute should be applied to struct
2929
| ^^^^^^
3030
LL | enum EPacked { A, B }
3131
| --------------------- not a struct or union
3232

3333
error[E0517]: attribute should be applied to struct
34-
--> $DIR/attr-usage-repr.rs:38:8
34+
--> $DIR/attr-usage-repr.rs:37:8
3535
|
3636
LL | #[repr(simd)] //~ ERROR: attribute should be applied to struct
3737
| ^^^^

‎src/test/ui/error-codes/E0565-1.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(attr_literals)]
12-
1311
// deprecated doesn't currently support literals
1412
#[deprecated("since")] //~ ERROR E0565
1513
fn f() { }

‎src/test/ui/error-codes/E0565-1.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0565]: unsupported literal
2-
--> $DIR/E0565-1.rs:14:14
2+
--> $DIR/E0565-1.rs:12:14
33
|
44
LL | #[deprecated("since")] //~ ERROR E0565
55
| ^^^^^^^

‎src/test/ui/error-codes/E0565.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(attr_literals)]
12-
1311
// repr currently doesn't support literals
1412
#[repr("C")] //~ ERROR E0565
1513
struct A { }

‎src/test/ui/error-codes/E0565.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0565]: unsupported literal
2-
--> $DIR/E0565.rs:14:8
2+
--> $DIR/E0565.rs:12:8
33
|
44
LL | #[repr("C")] //~ ERROR E0565
55
| ^^^

‎src/test/ui/feature-gates/feature-gate-custom_attribute.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// Check that literals in attributes parse just fine.
1212

13-
#![feature(rustc_attrs, attr_literals)]
13+
#![feature(rustc_attrs)]
1414
#![allow(dead_code)]
1515
#![allow(unused_variables)]
1616

‎src/test/ui/gated-attr-literals.rs

-43
This file was deleted.

0 commit comments

Comments
 (0)