auto merge of #907 : alexcrichton/cargo/update-curl, r=alexcrichton

Author: bors

Cargo.lock

@@ -2,7 +2,7 @@ use std::io::process::ExitStatus;
 
 use cargo::ops;
 use cargo::core::{MultiShell};
-use cargo::core::manifest::{BinTarget, ExampleTarget};
+use cargo::core::manifest::TargetKind;
 use cargo::util::{CliResult, CliError, human};
 use cargo::util::important_paths::{find_root_manifest_for_cwd};
 
@@ -71,9 +71,9 @@ pub fn execute(options: Options, shell: &mut MultiShell) -> CliResult<Option<()>
     };
 
     let (target_kind, name) = match (options.flag_bin, options.flag_example) {
-        (Some(bin), None) => (BinTarget, Some(bin)),
-        (None, Some(example)) => (ExampleTarget, Some(example)),
-        (None, None) => (BinTarget, None),
+        (Some(bin), None) => (TargetKind::Bin, Some(bin)),
+        (None, Some(example)) => (TargetKind::Example, Some(example)),
+        (None, None) => (TargetKind::Bin, None),
         (Some(_), Some(_)) => return Err(CliError::from_boxed(
             human("specify either `--bin` or `--example`, not both"), 1)),
     };

src/bin/run.rs

@@ -62,7 +62,7 @@ impl Dependency {
             name: name.to_string(),
             source_id: source_id.clone(),
             req: VersionReq::any(),
-            kind: Normal,
+            kind: Kind::Normal,
             only_match_name: true,
             optional: false,
             features: Vec::new(),
@@ -141,12 +141,12 @@ impl Dependency {
     /// Returns false if the dependency is only used to build the local package.
     pub fn is_transitive(&self) -> bool {
         match self.kind {
-            Normal | Build => true,
-            Development => false,
+            Kind::Normal | Kind::Build => true,
+            Kind::Development => false,
         }
     }
     pub fn is_build(&self) -> bool {
-        match self.kind { Build => true, _ => false }
+        match self.kind { Kind::Build => true, _ => false }
     }
     pub fn is_optional(&self) -> bool { self.optional }
     /// Returns true if the default features of the dependency are requested.