fix clippy::single_char_pattern perf findings
This commit is contained in:
parent
1796de7bb1
commit
97e844a032
19 changed files with 36 additions and 36 deletions
|
@ -2226,8 +2226,8 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
let canonical = f.replace("-", "_");
|
let canonical = f.replace('-', "_");
|
||||||
let canonical_name = name.replace("-", "_");
|
let canonical_name = name.replace('-', "_");
|
||||||
|
|
||||||
let is_rust_object =
|
let is_rust_object =
|
||||||
canonical.starts_with(&canonical_name) && looks_like_rust_object_file(&f);
|
canonical.starts_with(&canonical_name) && looks_like_rust_object_file(&f);
|
||||||
|
|
|
@ -872,7 +872,7 @@ Available lint options:
|
||||||
|
|
||||||
let print_lints = |lints: Vec<&Lint>| {
|
let print_lints = |lints: Vec<&Lint>| {
|
||||||
for lint in lints {
|
for lint in lints {
|
||||||
let name = lint.name_lower().replace("_", "-");
|
let name = lint.name_lower().replace('_', "-");
|
||||||
println!(
|
println!(
|
||||||
" {} {:7.7} {}",
|
" {} {:7.7} {}",
|
||||||
padded(&name),
|
padded(&name),
|
||||||
|
@ -908,10 +908,10 @@ Available lint options:
|
||||||
|
|
||||||
let print_lint_groups = |lints: Vec<(&'static str, Vec<LintId>)>| {
|
let print_lint_groups = |lints: Vec<(&'static str, Vec<LintId>)>| {
|
||||||
for (name, to) in lints {
|
for (name, to) in lints {
|
||||||
let name = name.to_lowercase().replace("_", "-");
|
let name = name.to_lowercase().replace('_', "-");
|
||||||
let desc = to
|
let desc = to
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|x| x.to_string().replace("_", "-"))
|
.map(|x| x.to_string().replace('_', "-"))
|
||||||
.collect::<Vec<String>>()
|
.collect::<Vec<String>>()
|
||||||
.join(", ");
|
.join(", ");
|
||||||
println!(" {} {}", padded(&name), desc);
|
println!(" {} {}", padded(&name), desc);
|
||||||
|
@ -960,7 +960,7 @@ fn print_flag_list<T>(
|
||||||
println!(
|
println!(
|
||||||
" {} {:>width$}=val -- {}",
|
" {} {:>width$}=val -- {}",
|
||||||
cmdline_opt,
|
cmdline_opt,
|
||||||
name.replace("_", "-"),
|
name.replace('_', "-"),
|
||||||
desc,
|
desc,
|
||||||
width = max_len
|
width = max_len
|
||||||
);
|
);
|
||||||
|
@ -1015,7 +1015,7 @@ pub fn handle_options(args: &[String]) -> Option<getopts::Matches> {
|
||||||
.iter()
|
.iter()
|
||||||
.map(|&(name, ..)| ('C', name))
|
.map(|&(name, ..)| ('C', name))
|
||||||
.chain(DB_OPTIONS.iter().map(|&(name, ..)| ('Z', name)))
|
.chain(DB_OPTIONS.iter().map(|&(name, ..)| ('Z', name)))
|
||||||
.find(|&(_, name)| *opt == name.replace("_", "-"))
|
.find(|&(_, name)| *opt == name.replace('_', "-"))
|
||||||
.map(|(flag, _)| format!("{}. Did you mean `-{} {}`?", e, flag, opt)),
|
.map(|(flag, _)| format!("{}. Did you mean `-{} {}`?", e, flag, opt)),
|
||||||
_ => None,
|
_ => None,
|
||||||
};
|
};
|
||||||
|
|
|
@ -472,7 +472,7 @@ pub trait Labeller<'a> {
|
||||||
/// Escape tags in such a way that it is suitable for inclusion in a
|
/// Escape tags in such a way that it is suitable for inclusion in a
|
||||||
/// Graphviz HTML label.
|
/// Graphviz HTML label.
|
||||||
pub fn escape_html(s: &str) -> String {
|
pub fn escape_html(s: &str) -> String {
|
||||||
s.replace("&", "&").replace("\"", """).replace("<", "<").replace(">", ">")
|
s.replace('&', "&").replace('\"', """).replace('<', "<").replace('>', ">")
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> LabelText<'a> {
|
impl<'a> LabelText<'a> {
|
||||||
|
|
|
@ -584,7 +584,7 @@ fn output_conflicts_with_dir(output_paths: &[PathBuf]) -> Option<PathBuf> {
|
||||||
fn escape_dep_filename(filename: &str) -> String {
|
fn escape_dep_filename(filename: &str) -> String {
|
||||||
// Apparently clang and gcc *only* escape spaces:
|
// Apparently clang and gcc *only* escape spaces:
|
||||||
// https://llvm.org/klaus/clang/commit/9d50634cfc268ecc9a7250226dd5ca0e945240d4
|
// https://llvm.org/klaus/clang/commit/9d50634cfc268ecc9a7250226dd5ca0e945240d4
|
||||||
filename.replace(" ", "\\ ")
|
filename.replace(' ', "\\ ")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Makefile comments only need escaping newlines and `\`.
|
// Makefile comments only need escaping newlines and `\`.
|
||||||
|
|
|
@ -295,7 +295,7 @@ pub fn struct_lint_level<'s, 'd>(
|
||||||
Level::Allow => "-A",
|
Level::Allow => "-A",
|
||||||
Level::ForceWarn => "--force-warn",
|
Level::ForceWarn => "--force-warn",
|
||||||
};
|
};
|
||||||
let hyphen_case_lint_name = name.replace("_", "-");
|
let hyphen_case_lint_name = name.replace('_', "-");
|
||||||
if lint_flag_val.as_str() == name {
|
if lint_flag_val.as_str() == name {
|
||||||
sess.diag_note_once(
|
sess.diag_note_once(
|
||||||
&mut err,
|
&mut err,
|
||||||
|
@ -306,7 +306,7 @@ pub fn struct_lint_level<'s, 'd>(
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
let hyphen_case_flag_val = lint_flag_val.as_str().replace("_", "-");
|
let hyphen_case_flag_val = lint_flag_val.as_str().replace('_', "-");
|
||||||
sess.diag_note_once(
|
sess.diag_note_once(
|
||||||
&mut err,
|
&mut err,
|
||||||
DiagnosticMessageId::from(lint),
|
DiagnosticMessageId::from(lint),
|
||||||
|
|
|
@ -126,7 +126,7 @@ impl<
|
||||||
write!(
|
write!(
|
||||||
w,
|
w,
|
||||||
r#"<tr><td align="left" balign="left">{}</td></tr>"#,
|
r#"<tr><td align="left" balign="left">{}</td></tr>"#,
|
||||||
dot::escape_html(§ion).replace("\n", "<br/>")
|
dot::escape_html(§ion).replace('\n', "<br/>")
|
||||||
)?;
|
)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,7 +147,7 @@ impl<
|
||||||
let src = self.node(source);
|
let src = self.node(source);
|
||||||
let trg = self.node(target);
|
let trg = self.node(target);
|
||||||
let escaped_edge_label = if let Some(edge_label) = edge_labels.get(index) {
|
let escaped_edge_label = if let Some(edge_label) = edge_labels.get(index) {
|
||||||
dot::escape_html(edge_label).replace("\n", r#"<br align="left"/>"#)
|
dot::escape_html(edge_label).replace('\n', r#"<br align="left"/>"#)
|
||||||
} else {
|
} else {
|
||||||
"".to_owned()
|
"".to_owned()
|
||||||
};
|
};
|
||||||
|
|
|
@ -681,13 +681,13 @@ fn hir_body<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> Option<&'tcx rustc_hir::B
|
||||||
}
|
}
|
||||||
|
|
||||||
fn escape_html(s: &str) -> String {
|
fn escape_html(s: &str) -> String {
|
||||||
s.replace("&", "&").replace("<", "<").replace(">", ">")
|
s.replace('&', "&").replace('<', "<").replace('>', ">")
|
||||||
}
|
}
|
||||||
|
|
||||||
fn escape_attr(s: &str) -> String {
|
fn escape_attr(s: &str) -> String {
|
||||||
s.replace("&", "&")
|
s.replace('&', "&")
|
||||||
.replace("\"", """)
|
.replace('\"', """)
|
||||||
.replace("'", "'")
|
.replace('\'', "'")
|
||||||
.replace("<", "<")
|
.replace('<', "<")
|
||||||
.replace(">", ">")
|
.replace('>', ">")
|
||||||
}
|
}
|
||||||
|
|
|
@ -148,7 +148,7 @@ impl DebugOptions {
|
||||||
let mut counter_format = ExpressionFormat::default();
|
let mut counter_format = ExpressionFormat::default();
|
||||||
|
|
||||||
if let Ok(env_debug_options) = std::env::var(RUSTC_COVERAGE_DEBUG_OPTIONS) {
|
if let Ok(env_debug_options) = std::env::var(RUSTC_COVERAGE_DEBUG_OPTIONS) {
|
||||||
for setting_str in env_debug_options.replace(" ", "").replace("-", "_").split(',') {
|
for setting_str in env_debug_options.replace(' ', "").replace('-', "_").split(',') {
|
||||||
let (option, value) = match setting_str.split_once('=') {
|
let (option, value) = match setting_str.split_once('=') {
|
||||||
None => (setting_str, None),
|
None => (setting_str, None),
|
||||||
Some((k, v)) => (k, Some(v)),
|
Some((k, v)) => (k, Some(v)),
|
||||||
|
|
|
@ -155,7 +155,7 @@ impl CoverageSpan {
|
||||||
format!(
|
format!(
|
||||||
"{}\n {}",
|
"{}\n {}",
|
||||||
source_range_no_file(tcx, &self.span),
|
source_range_no_file(tcx, &self.span),
|
||||||
self.format_coverage_statements(tcx, mir_body).replace("\n", "\n "),
|
self.format_coverage_statements(tcx, mir_body).replace('\n', "\n "),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2236,7 +2236,7 @@ impl<'a> Parser<'a> {
|
||||||
err.span_suggestion(
|
err.span_suggestion(
|
||||||
seq_span,
|
seq_span,
|
||||||
"...or a vertical bar to match on multiple alternatives",
|
"...or a vertical bar to match on multiple alternatives",
|
||||||
seq_snippet.replace(",", " |"),
|
seq_snippet.replace(',', " |"),
|
||||||
Applicability::MachineApplicable,
|
Applicability::MachineApplicable,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1036,7 +1036,7 @@ fn find_config(supplied: Option<Config>) -> Config {
|
||||||
|
|
||||||
// Helper function to escape quotes in a string
|
// Helper function to escape quotes in a string
|
||||||
fn escape(s: String) -> String {
|
fn escape(s: String) -> String {
|
||||||
s.replace("\"", "\"\"")
|
s.replace('\"', "\"\"")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helper function to determine if a span came from a
|
// Helper function to determine if a span came from a
|
||||||
|
|
|
@ -1213,7 +1213,7 @@ pub fn get_cmd_lint_options(
|
||||||
if lint_name == "help" {
|
if lint_name == "help" {
|
||||||
describe_lints = true;
|
describe_lints = true;
|
||||||
} else {
|
} else {
|
||||||
lint_opts_with_position.push((arg_pos, lint_name.replace("-", "_"), level));
|
lint_opts_with_position.push((arg_pos, lint_name.replace('-', "_"), level));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -335,7 +335,7 @@ fn build_options<O: Default>(
|
||||||
Some((k, v)) => (k.to_string(), Some(v)),
|
Some((k, v)) => (k.to_string(), Some(v)),
|
||||||
};
|
};
|
||||||
|
|
||||||
let option_to_lookup = key.replace("-", "_");
|
let option_to_lookup = key.replace('-', "_");
|
||||||
match descrs.iter().find(|(name, ..)| *name == option_to_lookup) {
|
match descrs.iter().find(|(name, ..)| *name == option_to_lookup) {
|
||||||
Some((_, setter, type_desc, _)) => {
|
Some((_, setter, type_desc, _)) => {
|
||||||
if !setter(&mut op, value) {
|
if !setter(&mut op, value) {
|
||||||
|
|
|
@ -85,7 +85,7 @@ pub fn find_crate_name(sess: &Session, attrs: &[ast::Attribute], input: &Input)
|
||||||
);
|
);
|
||||||
sess.err(&msg);
|
sess.err(&msg);
|
||||||
} else {
|
} else {
|
||||||
return validate(s.replace("-", "_"), None);
|
return validate(s.replace('-', "_"), None);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -741,7 +741,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
|
||||||
|
|
||||||
let msg = format!(
|
let msg = format!(
|
||||||
"the trait bound `{}: {}` is not satisfied",
|
"the trait bound `{}: {}` is not satisfied",
|
||||||
orig_ty.to_string(),
|
orig_ty,
|
||||||
old_ref.print_only_trait_path(),
|
old_ref.print_only_trait_path(),
|
||||||
);
|
);
|
||||||
if has_custom_message {
|
if has_custom_message {
|
||||||
|
|
|
@ -184,8 +184,8 @@ crate fn build_index<'tcx>(krate: &clean::Crate, cache: &mut Cache, tcx: TyCtxt<
|
||||||
})
|
})
|
||||||
.expect("failed serde conversion")
|
.expect("failed serde conversion")
|
||||||
// All these `replace` calls are because we have to go through JS string for JSON content.
|
// All these `replace` calls are because we have to go through JS string for JSON content.
|
||||||
.replace(r"\", r"\\")
|
.replace(r#"\"#, r"\\")
|
||||||
.replace("'", r"\'")
|
.replace(r#"'"#, r"\'")
|
||||||
// We need to escape double quotes for the JSON.
|
// We need to escape double quotes for the JSON.
|
||||||
.replace("\\\"", "\\\\\"")
|
.replace("\\\"", "\\\\\"")
|
||||||
)
|
)
|
||||||
|
|
|
@ -989,7 +989,7 @@ fn attributes(it: &clean::Item) -> Vec<String> {
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|attr| {
|
.filter_map(|attr| {
|
||||||
if ALLOWED_ATTRIBUTES.contains(&attr.name_or_empty()) {
|
if ALLOWED_ATTRIBUTES.contains(&attr.name_or_empty()) {
|
||||||
Some(pprust::attribute_to_string(attr).replace("\n", "").replace(" ", " "))
|
Some(pprust::attribute_to_string(attr).replace('\n', "").replace(" ", " "))
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
|
@ -963,7 +963,7 @@ fn preprocess_link<'a>(
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
let stripped = ori_link.link.replace("`", "");
|
let stripped = ori_link.link.replace('`', "");
|
||||||
let mut parts = stripped.split('#');
|
let mut parts = stripped.split('#');
|
||||||
|
|
||||||
let link = parts.next().unwrap();
|
let link = parts.next().unwrap();
|
||||||
|
|
|
@ -173,11 +173,11 @@ fn build_rule(v: &[u8], positions: &[usize]) -> String {
|
||||||
.map(|x| ::std::str::from_utf8(&v[x[0]..x[1]]).unwrap_or(""))
|
.map(|x| ::std::str::from_utf8(&v[x[0]..x[1]]).unwrap_or(""))
|
||||||
.collect::<String>()
|
.collect::<String>()
|
||||||
.trim()
|
.trim()
|
||||||
.replace("\n", " ")
|
.replace('\n', " ")
|
||||||
.replace("/", "")
|
.replace('/', "")
|
||||||
.replace("\t", " ")
|
.replace('\t', " ")
|
||||||
.replace("{", "")
|
.replace('{', "")
|
||||||
.replace("}", "")
|
.replace('}', "")
|
||||||
.split(' ')
|
.split(' ')
|
||||||
.filter(|s| !s.is_empty())
|
.filter(|s| !s.is_empty())
|
||||||
.collect::<Vec<&str>>()
|
.collect::<Vec<&str>>()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue