From 49c8ba91c73c97404d3308133594702a2bf48fd1 Mon Sep 17 00:00:00 2001 From: ljedrz Date: Mon, 23 Jul 2018 15:32:57 +0200 Subject: [PATCH] Change single char str patterns to chars --- src/librustc/dep_graph/debug.rs | 2 +- src/librustc/middle/stability.rs | 2 +- src/librustc_mir/util/pretty.rs | 6 +++--- src/librustc_target/abi/mod.rs | 4 ++-- src/libstd/sys/redox/net/mod.rs | 4 ++-- src/libstd/sys/unix/os.rs | 2 +- src/tools/tidy/src/deps.rs | 2 +- src/tools/tidy/src/features.rs | 2 +- src/tools/tidy/src/style.rs | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/librustc/dep_graph/debug.rs b/src/librustc/dep_graph/debug.rs index e56333aba9be5..f0e43e78a50af 100644 --- a/src/librustc/dep_graph/debug.rs +++ b/src/librustc/dep_graph/debug.rs @@ -40,7 +40,7 @@ impl DepNodeFilter { /// Tests whether `node` meets the filter, returning true if so. pub fn test(&self, node: &DepNode) -> bool { let debug_str = format!("{:?}", node); - self.text.split("&") + self.text.split('&') .map(|s| s.trim()) .all(|f| debug_str.contains(f)) } diff --git a/src/librustc/middle/stability.rs b/src/librustc/middle/stability.rs index fdcae38fc6a7c..262a617cb6924 100644 --- a/src/librustc/middle/stability.rs +++ b/src/librustc/middle/stability.rs @@ -165,7 +165,7 @@ impl<'a, 'tcx: 'a> Annotator<'a, 'tcx> { &attr::Stable {since: stab_since}) = (&stab.rustc_depr, &stab.level) { // Explicit version of iter::order::lt to handle parse errors properly for (dep_v, stab_v) in - dep_since.as_str().split(".").zip(stab_since.as_str().split(".")) { + dep_since.as_str().split('.').zip(stab_since.as_str().split('.')) { if let (Ok(dep_v), Ok(stab_v)) = (dep_v.parse::(), stab_v.parse()) { match dep_v.cmp(&stab_v) { Ordering::Less => { diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs index 6472e588bc621..0c4edb4427286 100644 --- a/src/librustc_mir/util/pretty.rs +++ b/src/librustc_mir/util/pretty.rs @@ -117,8 +117,8 @@ pub fn dump_enabled<'a, 'gcx, 'tcx>( // see notes on #41697 below tcx.item_path_str(source.def_id) }); - filters.split("|").any(|or_filter| { - or_filter.split("&").all(|and_filter| { + filters.split('|').any(|or_filter| { + or_filter.split('&').all(|and_filter| { and_filter == "all" || pass_name.contains(and_filter) || node_path.contains(and_filter) }) }) @@ -388,7 +388,7 @@ struct ExtraComments<'cx, 'gcx: 'tcx, 'tcx: 'cx> { impl<'cx, 'gcx, 'tcx> ExtraComments<'cx, 'gcx, 'tcx> { fn push(&mut self, lines: &str) { - for line in lines.split("\n") { + for line in lines.split('\n') { self.comments.push(line.to_string()); } } diff --git a/src/librustc_target/abi/mod.rs b/src/librustc_target/abi/mod.rs index 5762269242663..df09be00c342f 100644 --- a/src/librustc_target/abi/mod.rs +++ b/src/librustc_target/abi/mod.rs @@ -92,8 +92,8 @@ impl TargetDataLayout { let mut dl = TargetDataLayout::default(); let mut i128_align_src = 64; - for spec in target.data_layout.split("-") { - match &spec.split(":").collect::>()[..] { + for spec in target.data_layout.split('-') { + match &spec.split(':').collect::>()[..] { &["e"] => dl.endian = Endian::Little, &["E"] => dl.endian = Endian::Big, &["a", ref a..] => dl.aggregate_align = align(a, "a")?, diff --git a/src/libstd/sys/redox/net/mod.rs b/src/libstd/sys/redox/net/mod.rs index 0291d7f0e927a..67f22231d5f75 100644 --- a/src/libstd/sys/redox/net/mod.rs +++ b/src/libstd/sys/redox/net/mod.rs @@ -41,12 +41,12 @@ impl Iterator for LookupHost { pub fn lookup_host(host: &str) -> Result { let mut ip_string = String::new(); File::open("/etc/net/ip")?.read_to_string(&mut ip_string)?; - let ip: Vec = ip_string.trim().split(".").map(|part| part.parse::() + let ip: Vec = ip_string.trim().split('.').map(|part| part.parse::() .unwrap_or(0)).collect(); let mut dns_string = String::new(); File::open("/etc/net/dns")?.read_to_string(&mut dns_string)?; - let dns: Vec = dns_string.trim().split(".").map(|part| part.parse::() + let dns: Vec = dns_string.trim().split('.').map(|part| part.parse::() .unwrap_or(0)).collect(); if ip.len() == 4 && dns.len() == 4 { diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs index 82d05f78850d9..addf555eb1065 100644 --- a/src/libstd/sys/unix/os.rs +++ b/src/libstd/sys/unix/os.rs @@ -564,7 +564,7 @@ fn glibc_version_cstr() -> Option<&'static CStr> { // ignoring any extra dot-separated parts. Otherwise return None. #[cfg(target_env = "gnu")] fn parse_glibc_version(version: &str) -> Option<(usize, usize)> { - let mut parsed_ints = version.split(".").map(str::parse::).fuse(); + let mut parsed_ints = version.split('.').map(str::parse::).fuse(); match (parsed_ints.next(), parsed_ints.next()) { (Some(Ok(major)), Some(Ok(minor))) => Some((major, minor)), _ => None diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 942d27202ecd5..5105fc4ca4c19 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -165,7 +165,7 @@ impl<'a> Crate<'a> { impl<'a> CrateVersion<'a> { /// Returns the struct and whether or not the dep is in-tree pub fn from_str(s: &'a str) -> (Self, bool) { - let mut parts = s.split(" "); + let mut parts = s.split(' '); let name = parts.next().unwrap(); let version = parts.next().unwrap(); let path = parts.next().unwrap(); diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs index 4c0db993809f9..c9bc1b9d84970 100644 --- a/src/tools/tidy/src/features.rs +++ b/src/tools/tidy/src/features.rs @@ -257,7 +257,7 @@ pub fn collect_lang_features(base_src_path: &Path, bad: &mut bool) -> Features { None } else { next_feature_is_rustc_internal = false; - let s = issue_str.split("(").nth(1).unwrap().split(")").nth(0).unwrap(); + let s = issue_str.split('(').nth(1).unwrap().split(')').nth(0).unwrap(); Some(s.parse().unwrap()) }; Some((name.to_owned(), diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs index b784a0e4c5fa0..f2f35f0f58602 100644 --- a/src/tools/tidy/src/style.rs +++ b/src/tools/tidy/src/style.rs @@ -131,7 +131,7 @@ pub fn check(path: &Path, bad: &mut bool) { let skip_length = contents.contains("ignore-tidy-linelength"); let skip_end_whitespace = contents.contains("ignore-tidy-end-whitespace"); let mut trailing_new_lines = 0; - for (i, line) in contents.split("\n").enumerate() { + for (i, line) in contents.split('\n').enumerate() { let mut err = |msg: &str| { tidy_error!(bad, "{}:{}: {}", file.display(), i + 1, msg); };