Skip to content

Commit e5f9271

Browse files
crlf0710crlf0710
committed
Stablize non_ascii_idents feature.
1 parent e9cdccc commit e5f9271

File tree

57 files changed

+163
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+163
-546
lines changed

‎compiler/rustc_ast_passes/src/feature_gate.rs

+1-12
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_feature::{Features, GateIssue};
88
use rustc_session::parse::{feature_err, feature_err_issue};
99
use rustc_session::Session;
1010
use rustc_span::source_map::Spanned;
11-
use rustc_span::symbol::{sym, Symbol};
11+
use rustc_span::symbol::sym;
1212
use rustc_span::Span;
1313

1414
use tracing::debug;
@@ -320,17 +320,6 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
320320
}
321321
}
322322

323-
fn visit_name(&mut self, sp: Span, name: Symbol) {
324-
if !name.as_str().is_ascii() {
325-
gate_feature_post!(
326-
&self,
327-
non_ascii_idents,
328-
self.sess.parse_sess.source_map().guess_head_span(sp),
329-
"non-ascii idents are not fully supported"
330-
);
331-
}
332-
}
333-
334323
fn visit_item(&mut self, i: &'a ast::Item) {
335324
match i.kind {
336325
ast::ItemKind::ForeignMod(ref foreign_module) => {

‎compiler/rustc_error_codes/src/error_codes/E0554.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ beta compilers will not comply.
44
Erroneous code example:
55

66
```ignore (depends on release channel)
7-
#![feature(non_ascii_idents)] // error: `#![feature]` may not be used on the
8-
// stable release channel
7+
#![feature(lang_items)] // error: `#![feature]` may not be used on the
8+
// stable release channel
99
```
1010

1111
If you need the feature, make sure to use a nightly release of the compiler

‎compiler/rustc_error_codes/src/error_codes/E0754.md

-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ A non-ASCII identifier was used in an invalid context.
33
Erroneous code examples:
44

55
```compile_fail,E0754
6-
# #![feature(non_ascii_idents)]
76
87
mod řųśť; // error!
98
@@ -17,8 +16,6 @@ Non-ASCII can be used as module names if it is inlined or if a `#[path]`
1716
attribute is specified. For example:
1817

1918
```
20-
# #![feature(non_ascii_idents)]
21-
2219
mod řųśť { // ok!
2320
const IS_GREAT: bool = true;
2421
}

‎compiler/rustc_feature/src/accepted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,8 @@ declare_features! (
279279
(accepted, unsafe_block_in_unsafe_fn, "1.52.0", Some(71668), None),
280280
/// Allows the use of or-patterns (e.g., `0 | 1`).
281281
(accepted, or_patterns, "1.53.0", Some(54883), None),
282+
/// Allows defining identifiers beyond ASCII.
283+
(accepted, non_ascii_idents, "1.53.0", Some(55467), None),
282284

283285
// -------------------------------------------------------------------------
284286
// feature-group-end: accepted features

‎compiler/rustc_feature/src/active.rs

-3
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,6 @@ declare_features! (
258258
// feature-group-start: actual feature gates
259259
// -------------------------------------------------------------------------
260260

261-
/// Allows defining identifiers beyond ASCII.
262-
(active, non_ascii_idents, "1.0.0", Some(55467), None),
263-
264261
/// Allows using `#[plugin_registrar]` on functions.
265262
(active, plugin_registrar, "1.0.0", Some(29597), None),
266263

‎compiler/rustc_lint/src/non_ascii_idents.rs

+9-28
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ declare_lint! {
1010
///
1111
/// ```rust,compile_fail
1212
/// # #![allow(unused)]
13-
/// #![feature(non_ascii_idents)]
1413
/// #![deny(non_ascii_idents)]
1514
/// fn main() {
1615
/// let föö = 1;
@@ -21,14 +20,11 @@ declare_lint! {
2120
///
2221
/// ### Explanation
2322
///
24-
/// Currently on stable Rust, identifiers must contain ASCII characters.
25-
/// The [`non_ascii_idents`] nightly-only feature allows identifiers to
26-
/// contain non-ASCII characters. This lint allows projects that wish to
27-
/// retain the limit of only using ASCII characters to switch this lint to
28-
/// "forbid" (for example to ease collaboration or for security reasons).
23+
/// This lint allows projects that wish to retain the limit of only using
24+
/// ASCII characters to switch this lint to "forbid" (for example to ease
25+
/// collaboration or for security reasons).
2926
/// See [RFC 2457] for more details.
3027
///
31-
/// [`non_ascii_idents`]: https://doc.rust-lang.org/nightly/unstable-book/language-features/non-ascii-idents.html
3228
/// [RFC 2457]: https://github.com/rust-lang/rfcs/blob/master/text/2457-non-ascii-idents.md
3329
pub NON_ASCII_IDENTS,
3430
Allow,
@@ -44,18 +40,15 @@ declare_lint! {
4440
///
4541
/// ```rust
4642
/// # #![allow(unused)]
47-
/// #![feature(non_ascii_idents)]
4843
/// const µ: f64 = 0.000001;
4944
/// ```
5045
///
5146
/// {{produces}}
5247
///
5348
/// ### Explanation
5449
///
55-
/// With the [`non_ascii_idents`] nightly-only feature enabled,
56-
/// identifiers are allowed to use non-ASCII characters. This lint warns
57-
/// about using characters which are not commonly used, and may cause
58-
/// visual confusion.
50+
/// This lint warns about using characters which are not commonly used, and may
51+
/// cause visual confusion.
5952
///
6053
/// This lint is triggered by identifiers that contain a codepoint that is
6154
/// not part of the set of "Allowed" codepoints as described by [Unicode®
@@ -66,7 +59,6 @@ declare_lint! {
6659
/// that if you "forbid" this lint that existing code may fail in the
6760
/// future.
6861
///
69-
/// [`non_ascii_idents`]: https://doc.rust-lang.org/nightly/unstable-book/language-features/non-ascii-idents.html
7062
/// [TR39Allowed]: https://www.unicode.org/reports/tr39/#General_Security_Profile
7163
pub UNCOMMON_CODEPOINTS,
7264
Warn,
@@ -81,8 +73,6 @@ declare_lint! {
8173
/// ### Example
8274
///
8375
/// ```rust
84-
/// #![feature(non_ascii_idents)]
85-
///
8676
/// // Latin Capital Letter E With Caron
8777
/// pub const Ě: i32 = 1;
8878
/// // Latin Capital Letter E With Breve
@@ -93,10 +83,8 @@ declare_lint! {
9383
///
9484
/// ### Explanation
9585
///
96-
/// With the [`non_ascii_idents`] nightly-only feature enabled,
97-
/// identifiers are allowed to use non-ASCII characters. This lint warns
98-
/// when different identifiers may appear visually similar, which can
99-
/// cause confusion.
86+
/// This lint warns when different identifiers may appear visually similar,
87+
/// which can cause confusion.
10088
///
10189
/// The confusable detection algorithm is based on [Unicode® Technical
10290
/// Standard #39 Unicode Security Mechanisms Section 4 Confusable
@@ -110,7 +98,6 @@ declare_lint! {
11098
/// Beware that if you "forbid" this lint that existing code may fail in
11199
/// the future.
112100
///
113-
/// [`non_ascii_idents`]: https://doc.rust-lang.org/nightly/unstable-book/language-features/non-ascii-idents.html
114101
/// [TR39Confusable]: https://www.unicode.org/reports/tr39/#Confusable_Detection
115102
pub CONFUSABLE_IDENTS,
116103
Warn,
@@ -127,8 +114,6 @@ declare_lint! {
127114
/// ### Example
128115
///
129116
/// ```rust
130-
/// #![feature(non_ascii_idents)]
131-
///
132117
/// // The Japanese katakana character エ can be confused with the Han character 工.
133118
/// const エ: &'static str = "アイウ";
134119
/// ```
@@ -137,10 +122,8 @@ declare_lint! {
137122
///
138123
/// ### Explanation
139124
///
140-
/// With the [`non_ascii_idents`] nightly-only feature enabled,
141-
/// identifiers are allowed to use non-ASCII characters. This lint warns
142-
/// when characters between different scripts may appear visually similar,
143-
/// which can cause confusion.
125+
/// This lint warns when characters between different scripts may appear
126+
/// visually similar, which can cause confusion.
144127
///
145128
/// If the crate contains other identifiers in the same script that have
146129
/// non-confusable characters, then this lint will *not* be issued. For
@@ -152,8 +135,6 @@ declare_lint! {
152135
/// Note that the set of confusable characters may change over time.
153136
/// Beware that if you "forbid" this lint that existing code may fail in
154137
/// the future.
155-
///
156-
/// [`non_ascii_idents`]: https://doc.rust-lang.org/nightly/unstable-book/language-features/non-ascii-idents.html
157138
pub MIXED_SCRIPT_CONFUSABLES,
158139
Warn,
159140
"detects Unicode scripts whose mixed script confusables codepoints are solely used",

‎src/doc/unstable-book/src/language-features/non-ascii-idents.md

-48
This file was deleted.

‎src/test/debuginfo/multi-byte-chars.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
// compile-flags:-g
44

5-
#![feature(non_ascii_idents)]
6-
75
// This test checks whether debuginfo generation can handle multi-byte UTF-8
86
// characters at the end of a block. There's no need to do anything in the
97
// debugger -- just make sure that the compiler doesn't crash.

‎src/test/ui/codemap_tests/unicode_2.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(non_ascii_idents)]
2-
31
fn main() {
42
let _ = ("a̐éö̲", 0u7); //~ ERROR invalid width
53
let _ = ("아あ", 1i42); //~ ERROR invalid width

‎src/test/ui/codemap_tests/unicode_2.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
error: invalid width `7` for integer literal
2-
--> $DIR/unicode_2.rs:4:25
2+
--> $DIR/unicode_2.rs:2:25
33
|
44
LL | let _ = ("a̐éö̲", 0u7);
55
| ^^^
66
|
77
= help: valid widths are 8, 16, 32, 64 and 128
88

99
error: invalid width `42` for integer literal
10-
--> $DIR/unicode_2.rs:5:20
10+
--> $DIR/unicode_2.rs:3:20
1111
|
1212
LL | let _ = ("아あ", 1i42);
1313
| ^^^^
1414
|
1515
= help: valid widths are 8, 16, 32, 64 and 128
1616

1717
error[E0425]: cannot find value `a̐é` in this scope
18-
--> $DIR/unicode_2.rs:6:13
18+
--> $DIR/unicode_2.rs:4:13
1919
|
2020
LL | let _ = a̐é;
2121
| ^^ not found in this scope

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

-34
This file was deleted.

0 commit comments

Comments
 (0)