From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 12 May 2021 22:14:01 +0000 (+0100)
Subject: bundles: Use Into<String> in by_name_caseless
X-Git-Tag: otter-0.6.0~321
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5bfb29d919a079baf180bf52e9c438ebe7bcde21;p=otter.git

bundles: Use Into<String> in by_name_caseless

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bundles.rs b/src/bundles.rs
index 0c2607b6..6a450dbf 100644
--- 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)?)
   }