From 7d10d267d97acaee9f66fcb04fc4cc6647e930bc Mon Sep 17 00:00:00 2001 From: MarcoIeni Date: Sat, 30 Nov 2019 17:11:07 +0100 Subject: [PATCH 1/4] tests: removed deprecated try macro --- tests/common/util.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/common/util.rs b/tests/common/util.rs index 43e83f1e64e..756107d44a4 100644 --- a/tests/common/util.rs +++ b/tests/common/util.rs @@ -163,7 +163,7 @@ pub fn log_info, U: AsRef>(msg: T, par: U) { pub fn recursive_copy(src: &Path, dest: &Path) -> Result<()> { if fs::metadata(src)?.is_dir() { - for entry in try!(fs::read_dir(src)) { + for entry in fs::read_dir(src)? { let entry = entry?; let mut new_dest = PathBuf::from(dest); new_dest.push(entry.file_name()); From 82e1f548a5a3b8d8f9cc922fcaa0cd80f457106d Mon Sep 17 00:00:00 2001 From: MarcoIeni Date: Sat, 30 Nov 2019 19:44:33 +0100 Subject: [PATCH 2/4] substitute deprecated range form "..." with "..=" --- src/mktemp/mktemp.rs | 6 +++--- src/numfmt/numfmt.rs | 2 +- .../num_format/formatters/base_conv/mod.rs | 14 +++++++------- .../tokenize/num_format/formatters/float_common.rs | 6 +++--- src/printf/tokenize/num_format/formatters/intf.rs | 4 ++-- src/printf/tokenize/num_format/num_format.rs | 2 +- src/printf/tokenize/unescaped_text.rs | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/mktemp/mktemp.rs b/src/mktemp/mktemp.rs index 7c65d3e41a0..c5747385a6e 100644 --- a/src/mktemp/mktemp.rs +++ b/src/mktemp/mktemp.rs @@ -179,9 +179,9 @@ pub fn dry_exec(mut tmpdir: PathBuf, prefix: &str, rand: usize, suffix: &str) -> rand::thread_rng().fill(bytes); for byte in bytes.iter_mut() { *byte = match *byte % 62 { - v @ 0...9 => (v + '0' as u8), - v @ 10...35 => (v - 10 + 'a' as u8), - v @ 36...61 => (v - 36 + 'A' as u8), + v @ 0..=9 => (v + '0' as u8), + v @ 10..=35 => (v - 10 + 'a' as u8), + v @ 36..=61 => (v - 36 + 'A' as u8), _ => unreachable!(), } } diff --git a/src/numfmt/numfmt.rs b/src/numfmt/numfmt.rs index 3c34d4a19ae..604f35b2b37 100644 --- a/src/numfmt/numfmt.rs +++ b/src/numfmt/numfmt.rs @@ -92,7 +92,7 @@ fn parse_suffix(s: String) -> Result<(f64, Option)> { Some('E') => Ok(Some((RawSuffix::E, with_i))), Some('Z') => Ok(Some((RawSuffix::Z, with_i))), Some('Y') => Ok(Some((RawSuffix::Y, with_i))), - Some('0'...'9') => Ok(None), + Some('0'..='9') => Ok(None), _ => Err("Failed to parse suffix"), }?; diff --git a/src/printf/tokenize/num_format/formatters/base_conv/mod.rs b/src/printf/tokenize/num_format/formatters/base_conv/mod.rs index e2b8f0b0ada..af18044f951 100644 --- a/src/printf/tokenize/num_format/formatters/base_conv/mod.rs +++ b/src/printf/tokenize/num_format/formatters/base_conv/mod.rs @@ -298,13 +298,13 @@ impl RadixDef for RadixTen { } fn from_char(&self, c: char) -> Option { match c { - '0'...'9' => Some(c as u8 - ZERO_ASC), + '0'..='9' => Some(c as u8 - ZERO_ASC), _ => None, } } fn from_u8(&self, u: u8) -> Option { match u { - 0...9 => Some((ZERO_ASC + u) as char), + 0..=9 => Some((ZERO_ASC + u) as char), _ => None, } } @@ -316,16 +316,16 @@ impl RadixDef for RadixHex { } fn from_char(&self, c: char) -> Option { match c { - '0'...'9' => Some(c as u8 - ZERO_ASC), - 'A'...'F' => Some(c as u8 + 10 - UPPER_A_ASC), - 'a'...'f' => Some(c as u8 + 10 - LOWER_A_ASC), + '0'..='9' => Some(c as u8 - ZERO_ASC), + 'A'..='F' => Some(c as u8 + 10 - UPPER_A_ASC), + 'a'..='f' => Some(c as u8 + 10 - LOWER_A_ASC), _ => None, } } fn from_u8(&self, u: u8) -> Option { match u { - 0...9 => Some((ZERO_ASC + u) as char), - 10...15 => Some((UPPER_A_ASC + (u - 10)) as char), + 0..=9 => Some((ZERO_ASC + u) as char), + 10..=15 => Some((UPPER_A_ASC + (u - 10)) as char), _ => None, } } diff --git a/src/printf/tokenize/num_format/formatters/float_common.rs b/src/printf/tokenize/num_format/formatters/float_common.rs index 0b4a54b30b0..223272d6479 100644 --- a/src/printf/tokenize/num_format/formatters/float_common.rs +++ b/src/printf/tokenize/num_format/formatters/float_common.rs @@ -64,10 +64,10 @@ impl FloatAnalysis { let mut pos_before_first_nonzero_after_decimal: Option = None; while let Some(c) = str_it.next() { match c { - e @ '0'...'9' | e @ 'A'...'F' | e @ 'a'...'f' => { + e @ '0'..='9' | e @ 'A'..='F' | e @ 'a'..='f' => { if !hex_input { match e { - '0'...'9' => {} + '0'..='9' => {} _ => { warn_incomplete_conv(str_in); break; @@ -188,7 +188,7 @@ fn round_terminal_digit( .expect(""); } match digit_at_pos { - '5'...'9' => { + '5'..='9' => { let (new_after_dec, finished_in_dec) = _round_str_from(&after_dec, position); if finished_in_dec { return (before_dec, new_after_dec); diff --git a/src/printf/tokenize/num_format/formatters/intf.rs b/src/printf/tokenize/num_format/formatters/intf.rs index 498df3fc2ed..c5e517e3970 100644 --- a/src/printf/tokenize/num_format/formatters/intf.rs +++ b/src/printf/tokenize/num_format/formatters/intf.rs @@ -66,7 +66,7 @@ impl Intf { let c_opt = str_it.next(); if let Some(c) = c_opt { match c { - '0'...'9' | 'a'...'f' | 'A'...'F' => { + '0'..='9' | 'a'..='f' | 'A'..='F' => { if ret.len_digits == 0 && c == '0' { ret.is_zero = true; } else if ret.is_zero { @@ -76,7 +76,7 @@ impl Intf { if ret.len_digits == max_sd_in { if let Some(next_ch) = str_it.next() { match next_ch { - '0'...'9' => { + '0'..='9' => { ret.past_max = true; } _ => { diff --git a/src/printf/tokenize/num_format/num_format.rs b/src/printf/tokenize/num_format/num_format.rs index ba9c78d8518..23ca72936e7 100644 --- a/src/printf/tokenize/num_format/num_format.rs +++ b/src/printf/tokenize/num_format/num_format.rs @@ -143,7 +143,7 @@ fn get_inprefix(str_in: &String, field_type: &FieldType) -> InPrefix { ret.radix_in = Base::Hex; do_clean_lead_zeroes = true; } - e @ '0'...'9' => { + e @ '0'..='9' => { ret.offset += 1; match *field_type { FieldType::Intf => { diff --git a/src/printf/tokenize/unescaped_text.rs b/src/printf/tokenize/unescaped_text.rs index 2ccbf56fcad..93b1b229db2 100644 --- a/src/printf/tokenize/unescaped_text.rs +++ b/src/printf/tokenize/unescaped_text.rs @@ -85,14 +85,14 @@ impl UnescapedText { None => '\\', }; match ch { - '0'...'9' | 'x' => { + '0'..='9' | 'x' => { let min_len = 1; let mut max_len = 2; let mut base = 16; let ignore = false; match ch { 'x' => {} - e @ '0'...'9' => { + e @ '0'..='9' => { max_len = 3; base = 8; // in practice, gnu coreutils printf From fc1742bc525430d771c0b925aea2b457fa2aa885 Mon Sep 17 00:00:00 2001 From: MarcoIeni Date: Sat, 30 Nov 2019 19:45:16 +0100 Subject: [PATCH 3/4] numfmt: removed unused argument --- src/numfmt/numfmt.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/numfmt/numfmt.rs b/src/numfmt/numfmt.rs index 604f35b2b37..e454f78821d 100644 --- a/src/numfmt/numfmt.rs +++ b/src/numfmt/numfmt.rs @@ -315,10 +315,10 @@ pub fn uumain(args: Vec) -> i32 { let matches = opts.parse(&args[1..]).unwrap(); if matches.opt_present("help") { println!("{} {}", NAME, VERSION); - println!(""); + println!(); println!("Usage:"); println!(" {0} [STRING]... [OPTION]...", NAME); - println!(""); + println!(); print!( "{}", opts.usage("Convert numbers from/to human-readable strings") From 401871d156f2cf58e433a9b06604bb28a6771ca2 Mon Sep 17 00:00:00 2001 From: MarcoIeni Date: Sat, 30 Nov 2019 19:49:10 +0100 Subject: [PATCH 4/4] printf: subsitute "..." with "..=" --- src/printf/tokenize/sub.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/printf/tokenize/sub.rs b/src/printf/tokenize/sub.rs index cc0b1d3f23a..6e5311bf16b 100644 --- a/src/printf/tokenize/sub.rs +++ b/src/printf/tokenize/sub.rs @@ -180,7 +180,7 @@ impl SubParser { while let Some(ch) = it.next() { self.text_so_far.push(ch); match ch as char { - '-' | '*' | '0'...'9' => { + '-' | '*' | '0'..='9' => { if !self.past_decimal { if self.min_width_is_asterisk || self.specifiers_found { err_conv(&self.text_so_far);