Merge pull request #5302 from RalfJung/rustup

Rustup

Author: RalfJung

Cargo.lock

@@ -606,13 +606,17 @@ pub fn phase_runner(mut binary_args: impl Iterator<Item = String>, phase: Runner
     // We need to remove `--error-format` as cargo specifies that to be JSON,
     // but when we run here, cargo does not interpret the JSON any more. `--json`
     // then also needs to be dropped.
-    for arg in &info.args {
+    // We also need to remove `--force-warn=unused_crate_dependencies` as cargo is not there to
+    // process the output.
+    for arg in info.args {
         if let Some(suffix) = arg.strip_prefix("--error-format") {
             assert!(suffix.starts_with('='));
             // Drop this argument.
         } else if let Some(suffix) = arg.strip_prefix("--json") {
             assert!(suffix.starts_with('='));
             // Drop this argument.
+        } else if arg == "--force-warn=unused_crate_dependencies" {
+            // Drop this argument.
         } else {
             cmd.arg(arg);
         }

cargo-miri/src/phases.rs

@@ -1 +1 @@
-edc52f87c28f328c61685a02c47887a5cec7d767
+2e2b193f8ada105f27608b7be81c293e0d7292cb

rust-version

@@ -10,3 +10,6 @@ proc-macro = true
 [dependencies]
 # A common dependency of proc macros, let's make sure that works.
 proc-macro2 = "1.0"
+
+[lints.cargo]
+unused_dependencies = "allow"