Robot
/
watchexec
mirror of https://github.com/watchexec/watchexec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rustfmt fixes

This commit is contained in:
Matt Green 2016-10-30 12:28:54 -04:00
parent d859b4b70e
commit 69eedd4cc5
3 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cli.rs
View File

@ -103,11 +103,10 @@ pub fn get_args() -> Args {
}
let mut ignores = vec![];
let default_ignores = vec![
format!("*{}.*{}*", MAIN_SEPARATOR, MAIN_SEPARATOR),
format!("*{}.DS_Store", MAIN_SEPARATOR),
String::from("*.pyc"),
String::from("*.swp")];
let default_ignores = vec![format!("*{}.*{}*", MAIN_SEPARATOR, MAIN_SEPARATOR),
format!("*{}.DS_Store", MAIN_SEPARATOR),
String::from("*.pyc"),
String::from("*.swp")];
ignores.extend(default_ignores);
ignores.extend(values_t!(args.values_of("ignore"), String).unwrap_or(vec![]));

1
src/main.rs
View File

@ -213,4 +213,3 @@ fn wait(rx: &Receiver<Event>,
Some(paths)
}

43
src/process.rs
View File

@ -194,9 +194,7 @@ impl ProcessReaper {
}
});
ProcessReaper {
processes_tx: processes_tx
}
ProcessReaper { processes_tx: processes_tx }
}
pub fn wait_process(&self, process: imp::Process) {
@ -204,14 +202,14 @@ impl ProcessReaper {
}
}
fn get_single_updated_path<'a>(paths: &'a[PathBuf]) -> Option<&'a str> {
fn get_single_updated_path<'a>(paths: &'a [PathBuf]) -> Option<&'a str> {
paths.get(0).and_then(|p| p.to_str())
}
fn get_longest_common_path(paths: &[PathBuf]) -> Option<String> {
struct TreeNode<'a> {
value: Component<'a>,
children: BTreeMap<Component<'a>, Rc<RefCell<TreeNode<'a>>>>
children: BTreeMap<Component<'a>, Rc<RefCell<TreeNode<'a>>>>,
}
match paths.len() {
@ -224,7 +222,7 @@ fn get_longest_common_path(paths: &[PathBuf]) -> Option<String> {
// Build tree that contains each path component as a node value
let tree = Rc::new(RefCell::new(TreeNode {
value: Component::RootDir,
children: BTreeMap::new()
children: BTreeMap::new(),
}));
for path in paths {
@ -238,11 +236,13 @@ fn get_longest_common_path(paths: &[PathBuf]) -> Option<String> {
let cur_clone = cur_node.clone();
let mut borrowed = cur_clone.borrow_mut();
cur_node = borrowed.children.entry(component).or_insert(
Rc::new(RefCell::new(TreeNode {
cur_node = borrowed.children
.entry(component)
.or_insert(Rc::new(RefCell::new(TreeNode {
value: component,
children: BTreeMap::new()
}))).clone();
children: BTreeMap::new(),
})))
.clone();
}
}
@ -334,30 +334,23 @@ mod tests {
let single_result = get_longest_common_path(&single_path).unwrap();
assert_eq!(single_result, "/tmp/random/");
let common_paths = vec![
PathBuf::from("/tmp/logs/hi"),
PathBuf::from("/tmp/logs/bye"),
PathBuf::from("/tmp/logs/bye"),
PathBuf::from("/tmp/logs/fly")
];
let common_paths = vec![PathBuf::from("/tmp/logs/hi"),
PathBuf::from("/tmp/logs/bye"),
PathBuf::from("/tmp/logs/bye"),
PathBuf::from("/tmp/logs/fly")];
let common_result = get_longest_common_path(&common_paths).unwrap();
assert_eq!(common_result, "/tmp/logs");
let diverging_paths = vec![
PathBuf::from("/tmp/logs/hi"),
PathBuf::from("/var/logs/hi")
];
let diverging_paths = vec![PathBuf::from("/tmp/logs/hi"), PathBuf::from("/var/logs/hi")];
let diverging_result = get_longest_common_path(&diverging_paths).unwrap();
assert_eq!(diverging_result, "/");
let uneven_paths = vec![
PathBuf::from("/tmp/logs/hi"),
PathBuf::from("/tmp/logs/"),
PathBuf::from("/tmp/logs/bye")
];
let uneven_paths = vec![PathBuf::from("/tmp/logs/hi"),
PathBuf::from("/tmp/logs/"),
PathBuf::from("/tmp/logs/bye")];
let uneven_result = get_longest_common_path(&uneven_paths).unwrap();
assert_eq!(uneven_result, "/tmp/logs");