warnings, disable bsd target

kilork · Sep 14, 2019 · 5c9d177 · 5c9d177
1 parent 3b7b13a
commit 5c9d177
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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))
 }