diff --git a/.travis.yml b/.travis.yml index 5bbe47f..6fc09c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ matrix: os: osx # *BSD - - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1 + #- env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1 #- env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 #- env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1 diff --git a/src/lib.rs b/src/lib.rs index 8d77f68..af74601 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -598,7 +598,7 @@ impl<'a> MercurialRepo<'a> { ); } - let prefix = strip_leading_slash(self.config.path_prefix.as_ref(), &"".into()); + let prefix = strip_leading_slash(self.config.path_prefix.as_ref(), ""); for file in &mut changeset.files { match (&mut file.data, &mut file.manifest_entry) { (None, None) => { @@ -660,7 +660,7 @@ impl<'a> MercurialRepo<'a> { } } -fn strip_leading_slash(prefix: Option<&String>, x: &String) -> String { +fn strip_leading_slash(prefix: Option<&String>, x: &str) -> String { prefix.map_or_else(|| x.to_string(), |p| format!("{}/{}", p, x)) }