chiark
/
gitweb
/
~ianmdlvl
/
otter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
849cffd
)
bundles: Use Into<String> in by_name_caseless
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 12 May 2021 22:14:01 +0000
(23:14 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 13 May 2021 00:57:53 +0000
(
01:57
+0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/bundles.rs
patch
|
blob
|
history
diff --git
a/src/bundles.rs
b/src/bundles.rs
index 0c2607b6e48cb66b7dd178001113a7672a933ea3..6a450dbf147d3a35f793b3b1848993fc6af2ae18 100644
(file)
--- a/
src/bundles.rs
+++ b/
src/bundles.rs
@@
-328,9
+328,10
@@
impl IndexedZip where {
}
#[throws(LoadError)]
- pub fn by_name_caseless<'a>(&'a mut self, name: &str) -> Option<ZipFile<'a>>
+ pub fn by_name_caseless<'a, S>(&'a mut self, name: S) -> Option<ZipFile<'a>>
+ where S: Into<String>
{
- if_let!{ Some(&i) = self.members.get(&UniCase::new(name.
to_owned
()));
+ if_let!{ Some(&i) = self.members.get(&UniCase::new(name.
into
()));
else return Ok(None) }
Some(self.za.by_index(i)?)
}