matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fixup Into<str> for Path -> Impl as Into<String> for Path

Browse source
This commit is contained in:
Matthias Beyer 2015-12-27 17:48:53 +01:00
parent 3273e77d24
commit 4cac382412
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/storage/path.rs
View file

@ -81,9 +81,9 @@ impl<'a> Path<'a> {
/* /*
* Transform Path into str, so we can call glob() on it * Transform Path into str, so we can call glob() on it
*/ */
impl<'a> Into<&'a str> for Path<'a> { impl<'a> Into<String> for Path<'a> {
fn into(self) -> &'a str { fn into(self) -> String {
let mut s = self.base.clone(); let mut s = self.base.clone();
s.push(self.store.clone()); s.push(self.store.clone());
s.push(self.module.name()); s.push(self.module.name());
@ -94,15 +94,15 @@ impl<'a> Into<&'a str> for Path<'a> {
s.push("*"); s.push("*");
} }
s.set_extension("imag"); s.set_extension("imag");
s.to_str().unwrap_or("") s.to_str().unwrap_or("").into()
} }
} }
impl<'a> Into<Result<Paths, PatternError>> for Path<'a> { impl<'a> Into<Result<Paths, PatternError>> for Path<'a> {
fn into(self) -> Result<Paths, PatternError> { fn into(self) -> Result<Paths, PatternError> {
let s : &str = self.into(); let s : String = self.into();
glob(s) glob(&s[..])
} }
} }