In cargo new, reuse calculated name rather than recalculate

Author: dwijnand

src/bin/cargo/commands/new.rs

@@ -12,13 +12,7 @@ pub fn cli() -> App {
 pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let opts = args.new_options(config)?;
 
-    ops::new(&opts, config)?;
-    let path = args.value_of("path").unwrap();
-    let package_name = if let Some(name) = args.value_of("name") {
-        name
-    } else {
-        path
-    };
+    let package_name = ops::new(&opts, config)?;
     config.shell().status(
         "Created",
         format!("{} `{}` package", opts.kind, package_name),

src/cargo/ops/cargo_new.rs

@@ -299,7 +299,7 @@ fn plan_new_source_file(bin: bool, package_name: String) -> SourceFileInformatio
     }
 }
 
-pub fn new(opts: &NewOptions, config: &Config) -> CargoResult<()> {
+pub fn new<'a>(opts: &'a NewOptions, config: &Config) -> CargoResult<&'a str> {
     let path = &opts.path;
     if fs::metadata(path).is_ok() {
         failure::bail!(
@@ -329,7 +329,7 @@ pub fn new(opts: &NewOptions, config: &Config) -> CargoResult<()> {
             path.display()
         )
     })?;
-    Ok(())
+    Ok(name)
 }
 
 pub fn init(opts: &NewOptions, config: &Config) -> CargoResult<()> {