Auto merge of #1458 - alexcrichton:update, r=alexcrichton

Down with as_slice!

Author: bors

Cargo.lock

@@ -19,8 +19,8 @@ git2 = "0.2.1"
 git2-curl = "0.2.1"
 glob = "0.2.2"
 time = "0.1.19"
-log = "0.2.5"
-env_logger = "0.2.2"
+log = "0.3.0"
+env_logger = "0.3"
 docopt = "0.6.45"
 url = "0.2.23"
 rustc-serialize = "0.3.1"

Cargo.toml

@@ -1,9 +1,9 @@
 #![feature(core, exit_status, fs_ext)]
 
-extern crate "git2-curl" as git2_curl;
-extern crate "rustc-serialize" as rustc_serialize;
 extern crate cargo;
 extern crate env_logger;
+extern crate git2_curl;
+extern crate rustc_serialize;
 extern crate toml;
 #[macro_use] extern crate log;
 

src/bin/cargo.rs

@@ -67,13 +67,13 @@ impl Dependency {
     pub fn source_id(&self) -> &SourceId { &self.source_id }
     pub fn kind(&self) -> Kind { self.kind }
     pub fn specified_req(&self) -> Option<&str> {
-        self.specified_req.as_ref().map(|s| s.as_slice())
+        self.specified_req.as_ref().map(|s| &s[..])
     }
 
     /// If none, this dependencies must be built for all platforms.
     /// If some, it must only be built for the specified platform.
     pub fn only_for_platform(&self) -> Option<&str> {
-        self.only_for_platform.as_ref().map(|s| s.as_slice())
+        self.only_for_platform.as_ref().map(|s| &s[..])
     }
 
     pub fn set_kind(mut self, kind: Kind) -> Dependency {

src/cargo/core/dependency.rs

@@ -214,7 +214,7 @@ impl Manifest {
     pub fn warnings(&self) -> &[String] { &self.warnings }
     pub fn profiles(&self) -> &Profiles { &self.profiles }
     pub fn links(&self) -> Option<&str> {
-        self.links.as_ref().map(|s| s.as_slice())
+        self.links.as_ref().map(|s| &s[..])
     }
 
     pub fn add_warning(&mut self, s: String) {
@@ -235,7 +235,7 @@ impl Target {
         Target {
             kind: TargetKind::Bin,
             name: String::new(),
-            src_path: PathBuf::new(""),
+            src_path: PathBuf::new(),
             metadata: None,
             doc: false,
             doctest: false,