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.

Sign up for GitHub

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

Jump to bottom

Implement confusable_idents lint. #71542

Merged
merged 2 commits into from
May 3, 2020
Merged

Implement confusable_idents lint. #71542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c05961c
Implement `confusable_idents` lint.
crlf0710 Apr 25, 2020
f3ec00a
Add a fast code path to optimize `confusable_idents` lint for ASCII c…
crlf0710 May 1, 2020
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
81 changes: 41 additions & 40 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ name = "arena"
version = "0.0.0"
dependencies = [
"rustc_data_structures",
"smallvec 1.0.0",
"smallvec 1.4.0",
petrochenkov marked this conversation as resolved.
Show resolved Hide resolved
]

[[package]]
Expand Down Expand Up @@ -492,7 +492,7 @@ dependencies = [
"regex-syntax",
"semver",
"serde",
"smallvec 1.0.0",
"smallvec 1.4.0",
"toml",
"unicode-normalization",
"url 2.1.0",
Expand Down Expand Up @@ -2428,7 +2428,7 @@ dependencies = [
"cloudabi",
"libc",
"redox_syscall",
"smallvec 1.0.0",
"smallvec 1.4.0",
"winapi 0.3.8",
]

Expand Down Expand Up @@ -3151,7 +3151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81dfcfbb0ddfd533abf8c076e3b49d1e5042d1962526a12ce2c66d514b24cca3"
dependencies = [
"rustc-ap-rustc_data_structures",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand All @@ -3174,7 +3174,7 @@ dependencies = [
"rustc-ap-rustc_span",
"rustc-ap-serialize",
"scoped-tls",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -3223,7 +3223,7 @@ dependencies = [
"rustc-ap-rustc_session",
"rustc-ap-rustc_span",
"rustc-ap-serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand All @@ -3249,7 +3249,7 @@ dependencies = [
"rustc-hash",
"rustc-rayon",
"rustc-rayon-core",
"smallvec 1.0.0",
"smallvec 1.4.0",
"stable_deref_trait",
"winapi 0.3.8",
]
Expand Down Expand Up @@ -3291,7 +3291,7 @@ dependencies = [
"rustc-ap-rustc_session",
"rustc-ap-rustc_span",
"rustc-ap-serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand All @@ -3318,7 +3318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32220c3e6cdf226f38e4474b747dca15f3106bb680c74f10b299af3f6cdb1663"
dependencies = [
"rustc-ap-serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -3358,7 +3358,7 @@ dependencies = [
"rustc-ap-rustc_lexer",
"rustc-ap-rustc_session",
"rustc-ap-rustc_span",
"smallvec 1.0.0",
"smallvec 1.4.0",
"unicode-normalization",
]

Expand Down Expand Up @@ -3423,7 +3423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "756e8f526ec7906e132188bf25e3c10a6ee42ab77294ecb3b3602647f0508eef"
dependencies = [
"indexmap",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -3507,7 +3507,7 @@ dependencies = [
"serde",
"serde_json",
"smallvec 0.6.10",
"smallvec 1.0.0",
"smallvec 1.4.0",
"syn 0.15.35",
"url 2.1.0",
"winapi 0.3.8",
Expand All @@ -3518,7 +3518,7 @@ name = "rustc_apfloat"
version = "0.0.0"
dependencies = [
"bitflags",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand All @@ -3533,7 +3533,7 @@ dependencies = [
"rustc_span",
"scoped-tls",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand All @@ -3551,7 +3551,7 @@ dependencies = [
"rustc_session",
"rustc_span",
"rustc_target",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -3612,7 +3612,7 @@ dependencies = [
"rustc_session",
"rustc_span",
"rustc_target",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -3641,7 +3641,7 @@ dependencies = [
"rustc_span",
"rustc_target",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -3694,7 +3694,7 @@ dependencies = [
"rustc-rayon-core",
"rustc_index",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
"stable_deref_trait",
"winapi 0.3.8",
]
Expand Down Expand Up @@ -3768,7 +3768,7 @@ dependencies = [
"rustc_session",
"rustc_span",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -3797,7 +3797,7 @@ dependencies = [
"rustc_span",
"rustc_target",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -3833,7 +3833,7 @@ name = "rustc_index"
version = "0.0.0"
dependencies = [
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand All @@ -3853,7 +3853,7 @@ dependencies = [
"rustc_span",
"rustc_target",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -3895,7 +3895,7 @@ dependencies = [
"rustc_ty",
"rustc_typeck",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
"tempfile",
"winapi 0.3.8",
]
Expand Down Expand Up @@ -3968,7 +3968,7 @@ dependencies = [
"rustc_span",
"rustc_target",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
"stable_deref_trait",
"winapi 0.3.8",
]
Expand Down Expand Up @@ -4000,7 +4000,7 @@ dependencies = [
"rustc_target",
"scoped-tls",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -4029,7 +4029,7 @@ dependencies = [
"rustc_target",
"rustc_trait_selection",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand All @@ -4053,7 +4053,7 @@ dependencies = [
"rustc_target",
"rustc_trait_selection",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -4134,7 +4134,7 @@ dependencies = [
"rustc_index",
"rustc_span",
"serialize",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand All @@ -4157,7 +4157,7 @@ dependencies = [
"rustc_middle",
"rustc_session",
"rustc_span",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -4272,7 +4272,7 @@ dependencies = [
"rustc_session",
"rustc_span",
"rustc_target",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand All @@ -4287,7 +4287,7 @@ dependencies = [
"rustc_middle",
"rustc_span",
"rustc_trait_selection",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -4324,7 +4324,7 @@ dependencies = [
"rustc_span",
"rustc_target",
"rustc_trait_selection",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -4568,7 +4568,7 @@ name = "serialize"
version = "0.0.0"
dependencies = [
"indexmap",
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand Down Expand Up @@ -4635,9 +4635,9 @@ checksum = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"

[[package]]
name = "smallvec"
version = "1.0.0"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"

[[package]]
name = "socket2"
Expand Down Expand Up @@ -5359,11 +5359,11 @@ dependencies = [

[[package]]
name = "unicode-normalization"
version = "0.1.11"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
dependencies = [
"smallvec 1.0.0",
"smallvec 1.4.0",
]

[[package]]
Expand All @@ -5374,10 +5374,11 @@ checksum = "5b2c5c29e805da6817f5af6a627d65adb045cebf05cccd5a3493d6109454391c"

[[package]]
name = "unicode-security"
version = "0.0.2"
version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c49d35967fa037b881acc34ef717c38c4b5560eba10e3685271b3f530bb19634"
checksum = "a5f9011bbed9c13372bc8df618b55a38138445199caf3b61d432c6859c36dee0"
dependencies = [
"unicode-normalization",
"unicode-script",
]

Expand Down
9 changes: 5 additions & 4 deletions src/librustc_expand/proc_macro_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ impl FromInternal<(TreeAndJoint, &'_ ParseSess, &'_ mut Vec<Self>)>
SingleQuote => op!('\''),

Ident(name, false) if name == kw::DollarCrate => tt!(Ident::dollar_crate()),
Ident(name, is_raw) => tt!(Ident::new(name, is_raw)),
Ident(name, is_raw) => tt!(Ident::new(sess, name, is_raw)),
Lifetime(name) => {
let ident = ast::Ident::new(name, span).without_first_quote();
stack.push(tt!(Ident::new(ident.name, false)));
stack.push(tt!(Ident::new(sess, ident.name, false)));
tt!(Punct::new('\'', true))
}
Literal(lit) => tt!(Literal { lit }),
Expand Down Expand Up @@ -322,7 +322,7 @@ impl Ident {
false
}
}
fn new(sym: Symbol, is_raw: bool, span: Span) -> Ident {
fn new(sess: &ParseSess, sym: Symbol, is_raw: bool, span: Span) -> Ident {
let sym = nfc_normalize(&sym.as_str());
let string = sym.as_str();
if !Self::is_valid(&string) {
Expand All @@ -331,6 +331,7 @@ impl Ident {
if is_raw && !sym.can_be_raw() {
panic!("`{}` cannot be a raw identifier", string);
}
sess.symbol_gallery.insert(sym, span);
Ident { sym, is_raw, span }
}
fn dollar_crate(span: Span) -> Ident {
Expand Down Expand Up @@ -495,7 +496,7 @@ impl server::Punct for Rustc<'_> {

impl server::Ident for Rustc<'_> {
fn new(&mut self, string: &str, span: Self::Span, is_raw: bool) -> Self::Ident {
Ident::new(Symbol::intern(string), is_raw, span)
Ident::new(self.sess, Symbol::intern(string), is_raw, span)
}
fn span(&mut self, ident: Self::Ident) -> Self::Span {
ident.span
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_lint/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ path = "lib.rs"

[dependencies]
log = "0.4"
unicode-security = "0.0.2"
unicode-security = "0.0.3"
rustc_middle = { path = "../librustc_middle" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" }
rustc_attr = { path = "../librustc_attr" }
Expand Down
Loading