diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-03 09:16:34 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-03 09:16:34 +0530 |
| commit | 9da739acefc7d1776bf727c8bf782eb79f241028 (patch) | |
| tree | f0a67b0f04751ccc0cf990930af11a7e83b27d60 /components/script/dom/userscripts.rs | |
| parent | 6844adbe2dd2730cbc13df0a78736386501cad02 (diff) | |
| parent | 6b215f38eefc98853244c2ec6f4187ae6f000417 (diff) | |
| download | servo-9da739acefc7d1776bf727c8bf782eb79f241028.tar.gz servo-9da739acefc7d1776bf727c8bf782eb79f241028.zip | |
Auto merge of #9123 - karyon:clippy_cleanup, r=Manishearth
Fix a bunch of clippy lints
This fixes about 130 clippy lints. Let me know if i should split up the commit.
I wasn't sure about some of the changes, especially map_or instead of map(...).unwrap_or(...) and if let instead of single arm match were not always a strict improvement in my opinion, but i'll leave that decision to the reviewer :)
There are about 150 lints left which i thought were clippy bugs or i didn't know how to fix.
cc @Manishearth
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9123)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/userscripts.rs')
| -rw-r--r-- | components/script/dom/userscripts.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/userscripts.rs b/components/script/dom/userscripts.rs index 6cd08257b00..91f521c6922 100644 --- a/components/script/dom/userscripts.rs +++ b/components/script/dom/userscripts.rs @@ -31,7 +31,7 @@ pub fn load_script(head: &HTMLHeadElement) { PathBuf::from(path_str) }; - let mut files = read_dir(&path).ok().expect("Bad path passed to --userscripts") + let mut files = read_dir(&path).expect("Bad path passed to --userscripts") .filter_map(|e| e.ok()) .map(|e| e.path()).collect::<Vec<_>>(); |