Skip to content

Commit 8d81d5a

Browse files
fmeasefmease
committed
Validate crate name in CLI option --extern
1 parent f072775 commit 8d81d5a

15 files changed

+60
-17
lines changed

‎compiler/rustc_session/src/config.rs

+13
Original file line numberDiff line numberDiff line change
@@ -2451,6 +2451,19 @@ pub fn parse_externs(
24512451
Some((opts, name)) => (Some(opts), name.to_string()),
24522452
};
24532453

2454+
if !crate::utils::is_ascii_ident(&name) {
2455+
let mut error = handler.early_struct_error(format!(
2456+
"crate name `{name}` passed to `--extern` is not a valid ASCII identifier"
2457+
));
2458+
let adjusted_name = name.replace("-", "_");
2459+
if crate::utils::is_ascii_ident(&adjusted_name) {
2460+
error.help(format!(
2461+
"consider replacing the dashes with underscores: `{adjusted_name}`"
2462+
));
2463+
}
2464+
error.emit();
2465+
}
2466+
24542467
let path = path.map(|p| CanonicalizedPath::new(p));
24552468

24562469
let entry = externs.entry(name.to_owned());

‎compiler/rustc_session/src/session.rs

+9
Original file line numberDiff line numberDiff line change
@@ -1710,6 +1710,15 @@ impl EarlyErrorHandler {
17101710
self.handler.struct_fatal(msg).emit()
17111711
}
17121712

1713+
#[allow(rustc::untranslatable_diagnostic)]
1714+
#[allow(rustc::diagnostic_outside_of_impl)]
1715+
pub(crate) fn early_struct_error(
1716+
&self,
1717+
msg: impl Into<DiagnosticMessage>,
1718+
) -> DiagnosticBuilder<'_, !> {
1719+
self.handler.struct_fatal(msg)
1720+
}
1721+
17131722
#[allow(rustc::untranslatable_diagnostic)]
17141723
#[allow(rustc::diagnostic_outside_of_impl)]
17151724
pub fn early_warn(&self, msg: impl Into<DiagnosticMessage>) {

‎compiler/rustc_session/src/utils.rs

+9
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,12 @@ pub fn extra_compiler_flags() -> Option<(Vec<String>, bool)> {
158158

159159
if !result.is_empty() { Some((result, excluded_cargo_defaults)) } else { None }
160160
}
161+
162+
pub(crate) fn is_ascii_ident(string: &str) -> bool {
163+
let mut chars = string.chars();
164+
if let Some(start) = chars.next() && (start.is_ascii_alphabetic() || start == '_') {
165+
chars.all(|char| char.is_ascii_alphanumeric() || char == '_')
166+
} else {
167+
false
168+
}
169+
}

‎tests/run-make/incr-foreign-head-span/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ INCR=$(TMPDIR)/incr
1515
all:
1616
cp first_crate.rs second_crate.rs $(TMPDIR)
1717
$(RUSTC) $(TMPDIR)/first_crate.rs -C incremental=$(INCR) --target $(TARGET) --crate-type lib
18-
$(RUSTC) $(TMPDIR)/second_crate.rs -C incremental=$(INCR) --target $(TARGET) --extern first-crate=$(TMPDIR) --crate-type lib
18+
$(RUSTC) $(TMPDIR)/second_crate.rs -C incremental=$(INCR) --target $(TARGET) --extern first_crate=$(TMPDIR)/libfirst_crate.rlib --crate-type lib
1919
rm $(TMPDIR)/first_crate.rs
2020
$(RUSTC) $(TMPDIR)/second_crate.rs -C incremental=$(INCR) --target $(TARGET) --cfg second_run --crate-type lib
2121

‎tests/ui/extern-flag/invalid-crate-name-dashed.rs

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// compile-flags: --extern=my-awesome-library=libawesome.rlib
2+
// error-pattern: crate name `my-awesome-library` passed to `--extern` is not a valid ASCII identifier
3+
// error-pattern: consider replacing the dashes with underscores: `my_awesome_library`
4+
5+
// In a sense, this is a regression test for issue #113035. We no longer suggest
6+
// `pub use my-awesome-library::*;` (sic!) as we outright ban this crate name.
7+
8+
pub use my_awesome_library::*;
9+
10+
fn main() {}

‎tests/ui/extern-flag/invalid-crate-name-dashed.stderr

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
error: crate name `my-awesome-library` passed to `--extern` is not a valid ASCII identifier
2+
|
3+
= help: consider replacing the dashes with underscores: `my_awesome_library`
4+

‎tests/ui/extern-flag/invalid-crate-name-non-ascii.rs

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// compile-flags: --extern čɍαţē=libnon_ascii.rlib
2+
// error-pattern: crate name `čɍαţē` passed to `--extern` is not a valid ASCII identifier
3+
4+
fn main() {}

‎tests/ui/extern-flag/invalid-crate-name-non-ascii.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
error: crate name `čɍαţē` passed to `--extern` is not a valid ASCII identifier
2+

‎tests/ui/extern-flag/invalid-crate-name.rs

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// compile-flags: --extern=?#1%$
2+
// error-pattern: crate name `?#1%$` passed to `--extern` is not a valid ASCII identifier
3+
4+
fn main() {}

‎tests/ui/extern-flag/invalid-crate-name.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
error: crate name `?#1%$` passed to `--extern` is not a valid ASCII identifier
2+

‎tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-2.rs

-6
This file was deleted.

‎tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-2.stderr

-8
This file was deleted.

‎tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-1.rs ‎tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden.rs

File renamed without changes.

‎tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden-1.stderr ‎tests/ui/rfcs/rfc-2457-non-ascii-idents/crate_name_nonascii_forbidden.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: cannot load a crate with a non-ascii name `ьаг`
2-
--> $DIR/crate_name_nonascii_forbidden-1.rs:1:1
2+
--> $DIR/crate_name_nonascii_forbidden.rs:1:1
33
|
44
LL | extern crate ьаг;
55
| ^^^^^^^^^^^^^^^^^

‎tests/ui/rust-2018/trait-import-suggestions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// edition:2018
22
// aux-build:trait-import-suggestions.rs
3-
// compile-flags:--extern trait-import-suggestions
3+
// compile-flags:--extern trait_import_suggestions
44

55
mod foo {
66
mod foobar {

0 commit comments

Comments
 (0)