bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move is_ascii_ident to where it's used.

Browse source
This commit is contained in:
Nicholas Nethercote 2023-11-29 01:16:25 +11:00
parent f8ce1864d3
commit dba94164e9
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_session/src/config.rs
View file

@ -2456,6 +2456,17 @@ pub fn parse_externs(
matches: &getopts::Matches, matches: &getopts::Matches,
unstable_opts: &UnstableOptions, unstable_opts: &UnstableOptions,
) -> Externs { ) -> Externs {
fn is_ascii_ident(string: &str) -> bool {
let mut chars = string.chars();
if let Some(start) = chars.next()
&& (start.is_ascii_alphabetic() || start == '_')
{
chars.all(|char| char.is_ascii_alphanumeric() || char == '_')
} else {
false
}
}
let is_unstable_enabled = unstable_opts.unstable_options; let is_unstable_enabled = unstable_opts.unstable_options;
let mut externs: BTreeMap<String, ExternEntry> = BTreeMap::new(); let mut externs: BTreeMap<String, ExternEntry> = BTreeMap::new();
for arg in matches.opt_strs("extern") { for arg in matches.opt_strs("extern") {
@ -2468,12 +2479,12 @@ pub fn parse_externs(
Some((opts, name)) => (Some(opts), name.to_string()), Some((opts, name)) => (Some(opts), name.to_string()),
}; };
if !crate::utils::is_ascii_ident(&name) { if !is_ascii_ident(&name) {
let mut error = handler.early_struct_error(format!( let mut error = handler.early_struct_error(format!(
"crate name `{name}` passed to `--extern` is not a valid ASCII identifier" "crate name `{name}` passed to `--extern` is not a valid ASCII identifier"
)); ));
let adjusted_name = name.replace('-', "_"); let adjusted_name = name.replace('-', "_");
if crate::utils::is_ascii_ident(&adjusted_name) { if is_ascii_ident(&adjusted_name) {
error.help(format!( error.help(format!(
"consider replacing the dashes with underscores: `{adjusted_name}`" "consider replacing the dashes with underscores: `{adjusted_name}`"
)); ));

11
compiler/rustc_session/src/utils.rs
View file

@ -158,14 +158,3 @@ pub fn extra_compiler_flags() -> Option<(Vec<String>, bool)> {
if !result.is_empty() { Some((result, excluded_cargo_defaults)) } else { None } if !result.is_empty() { Some((result, excluded_cargo_defaults)) } else { None }
} }
pub(crate) fn is_ascii_ident(string: &str) -> bool {
let mut chars = string.chars();
if let Some(start) = chars.next()
&& (start.is_ascii_alphabetic() || start == '_')
{
chars.all(|char| char.is_ascii_alphanumeric() || char == '_')
} else {
false
}
}