Auto merge of #200 - JohnTitor:cargo-next, r=JohnTitor

Update `cargo` dependency to 0.54

The breaking change was introduced in rust-lang/cargo#9290.

Author: bors

Cargo.lock

@@ -11,7 +11,7 @@ license-file = "LICENSE"
 edition = "2018"
 
 [dependencies]
-cargo = "0.53"
+cargo = "0.54"
 crates-io = "0.33" # Keep in sync with version pulled by Cargo
 curl = "0.4.38"
 env_logger = "0.8"

Cargo.toml

@@ -3,8 +3,9 @@
 
 extern crate rustc_session;
 
-use cargo::core::{Package, PackageId, Source, SourceId, Workspace};
+use cargo::core::{FeatureValue, Package, PackageId, Source, SourceId, Workspace};
 use cargo::sources::RegistrySource;
+use cargo::util::interning::InternedString;
 use curl::easy::Easy;
 use log::debug;
 use rustc_session::getopts;
@@ -15,6 +16,7 @@ use std::{
     io::Write,
     path::{Path, PathBuf},
     process::{Command, Stdio},
+    rc::Rc,
     sync::{Arc, RwLock},
 };
 
@@ -491,11 +493,16 @@ impl<'a> WorkInfo<'a> {
         };
 
         if let Some(s) = matches.opt_str("features") {
-            opts.features = s.split(' ').map(str::to_owned).collect();
+            opts.cli_features.features = Rc::new(
+                s.split(' ')
+                    .map(InternedString::new)
+                    .map(|f| FeatureValue::new(f))
+                    .collect(),
+            );
         }
 
-        opts.all_features = matches.opt_present("all-features");
-        opts.no_default_features = matches.opt_present("no-default-features");
+        opts.cli_features.all_features = matches.opt_present("all-features");
+        opts.cli_features.uses_default_features = !matches.opt_present("no-default-features");
 
         env::set_var(
             "RUSTFLAGS",