RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-01 13:37:48 +00:00
Code Issues Activity

regex::Captures::{at,name} returns Option

Browse source
This commit is contained in:
Haitao Li 2014-12-22 10:51:19 +11:00
parent 5cfde0dcb9
commit 872bb0010a
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/chmod/chmod.rs
View file

@ -205,9 +205,9 @@ fn chmod_file(file: &Path, name: &str, changes: bool, quiet: bool, verbose: bool
}; };
for mode in cmode.unwrap().as_slice().split(',') { // cmode is guaranteed to be Some in this case for mode in cmode.unwrap().as_slice().split(',') { // cmode is guaranteed to be Some in this case
let cap = REGEXP.captures(mode).unwrap(); // mode was verified earlier, so this is safe let cap = REGEXP.captures(mode).unwrap(); // mode was verified earlier, so this is safe
if cap.at(1) != "" { if cap.at(1).unwrap() != "" {
// symbolic // symbolic
let mut levels = cap.at(2); let mut levels = cap.at(2).unwrap();
if levels.len() == 0 { if levels.len() == 0 {
levels = "a"; levels = "a";
} }
@ -272,7 +272,7 @@ fn chmod_file(file: &Path, name: &str, changes: bool, quiet: bool, verbose: bool
} }
} else { } else {
// numeric // numeric
let change = cap.at(4); let change = cap.at(4).unwrap();
let ch = change.char_at(0); let ch = change.char_at(0);
let (action, slice) = match ch { let (action, slice) = match ch {
'+' | '-' | '=' => (ch, change.slice_from(1)), '+' | '-' | '=' => (ch, change.slice_from(1)),

8
src/hashsum/hashsum.rs
View file

@ -213,9 +213,13 @@ fn hashsum(algoname: &str, mut digest: Box<Digest>, files: Vec<String>, binary:
for (i, line) in buffer.lines().enumerate() { for (i, line) in buffer.lines().enumerate() {
let line = safe_unwrap!(line); let line = safe_unwrap!(line);
let (ck_filename, sum, binary_check): (_, Vec<Ascii>, _) = match gnu_re.captures(line.as_slice()) { let (ck_filename, sum, binary_check): (_, Vec<Ascii>, _) = match gnu_re.captures(line.as_slice()) {
Some(caps) => (caps.name("fileName"), caps.name("digest").to_ascii().iter().map(|ch| ch.to_lowercase()).collect(), caps.name("binary") == "*"), Some(caps) => (caps.name("fileName").unwrap(),
caps.name("digest").unwrap().to_ascii().iter().map(|ch| ch.to_lowercase()).collect(),
caps.name("binary").unwrap() == "*"),
None => match bsd_re.captures(line.as_slice()) { None => match bsd_re.captures(line.as_slice()) {
Some(caps) => (caps.name("fileName"), caps.name("digest").to_ascii().iter().map(|ch| ch.to_lowercase()).collect(), true), Some(caps) => (caps.name("fileName").unwrap(),
caps.name("digest").unwrap().to_ascii().iter().map(|ch| ch.to_lowercase()).collect(),
true),
None => { None => {
bad_format += 1; bad_format += 1;
if strict { if strict {