diff options
author | Ben S <ogham@bsago.me> | 2014-12-12 14:06:48 +0000 |
---|---|---|
committer | Ben S <ogham@bsago.me> | 2014-12-12 14:06:48 +0000 |
commit | 66339e7a1546a92b1c1fa2935384143e28e11098 (patch) | |
tree | 69e058326dbe551dcc1181cecc6d87ce5493e564 /src/filetype.rs | |
parent | 4484982734e9c11c7c3845321e9043ece7c7aeb9 (diff) |
Miscellaneous little optimisations
- Prefer iter over into_iter where appropriate
- Cut down on cloning
Diffstat (limited to 'src/filetype.rs')
-rw-r--r-- | src/filetype.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/filetype.rs b/src/filetype.rs index 7a8f905..f4812bf 100644 --- a/src/filetype.rs +++ b/src/filetype.rs @@ -96,9 +96,8 @@ impl<'a> HasType for File<'a> { else if name.starts_with("README") || BUILD_TYPES.iter().any(|&s| s == name) { return Immediate; } - else if self.ext.is_some() { - let e = self.ext.clone().unwrap().to_ascii_lower(); - let ext = e.as_slice(); + else if let Some(ref e) = self.ext { + let ext = e.as_slice().to_ascii_lower(); if IMAGE_TYPES.iter().any(|&s| s == ext) { return Image; } @@ -125,7 +124,7 @@ impl<'a> HasType for File<'a> { } let source_files = self.get_source_files(); - if source_files.len() == 0 { + if source_files.is_empty() { return Normal; } else if source_files.iter().any(|path| self.dir.map(|d| d.contains(path)).unwrap_or(false)) { @@ -140,6 +139,7 @@ impl<'a> HasType for File<'a> { } } } + return Normal; // no filetype } } |