comments don't exceed 90 chars; remove '-Z unstable-options' from test

Hezuikn · Sep 22, 2022 · 92d69ab · 92d69ab
1 parent 1f35d3c
commit 92d69ab
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/src/cargo/core/resolver/resolve.rs b/src/cargo/core/resolver/resolve.rs
@@ -172,10 +172,10 @@ this could be indicative of a few possible situations:
                         id.source_id()
                     )
 
-                // If our checksum hasn't been calculated, then it could mean
-                // that future Cargo figured out how to checksum something or
-                // more realistically we were overridden with a source that does
-                // not have checksums.
+                    // If our checksum hasn't been calculated, then it could mean
+                    // that future Cargo figured out how to checksum something or
+                    // more realistically we were overridden with a source that does
+                    // not have checksums.
                 } else if mine.is_none() {
                     anyhow::bail!(
                         "\
@@ -194,9 +194,9 @@ unable to verify that `{0}` is the same as when the lockfile was generated
                         id.source_id()
                     )
 
-                // If the checksums aren't equal, and neither is None, then they
-                // must both be Some, in which case the checksum now differs.
-                // That's quite bad!
+                    // If the checksums aren't equal, and neither is None, then they
+                    // must both be Some, in which case the checksum now differs.
+                    // That's quite bad!
                 } else {
                     anyhow::bail!(
                         "\
@@ -298,7 +298,8 @@ unable to verify that `{0}` is the same as when the lockfile was generated
         &self.metadata
     }
 
-    /// Based on the dependencies between `from -> to.to_target`, return a list of one or more unique extern_crate_name/dependency-name pairs.
+    /// Based on the dependencies between `from -> to.to_target`, return a list of one
+    /// or more unique extern_crate_name/dependency-name pairs.
     /// Note that the `dependency-name` is used to derive the `extern_crate_name`.
     /// If `to == from` or if there is no dependency, the targets crate name is used.
     pub fn extern_crate_names_and_dep_names(

diff --git a/tests/testsuite/artifact_dep.rs b/tests/testsuite/artifact_dep.rs
@@ -1421,7 +1421,7 @@ fn profile_override_basic_multidep() {
         .file("bar/src/lib.rs", "pub fn bar() {}")
         .build();
 
-    p.cargo("build -v -Z unstable-options -Z bindeps -Z multidep")
+    p.cargo("build -v -Z bindeps -Z multidep")
         .masquerade_as_nightly_cargo()
         .with_stderr_contains(
             "[RUNNING] `rustc --crate-name build_script_build [..] -C opt-level=1 [..]`",
@@ -2248,7 +2248,7 @@ fn lib_artifacts_do_not_leak_when_same_package_gets_renamed() {
         .file("bar/src/lib.rs", "pub fn doit() {}")
         .build();
 
-    p.cargo("check -v -Z unstable-options -Z bindeps -Z multidep")
+    p.cargo("check -v -Z bindeps -Z multidep")
         .masquerade_as_nightly_cargo()
         .with_status(101)
         .with_stderr_contains("error[E0463]: can't find crate for `bar_alternate`")
@@ -2353,7 +2353,7 @@ fn multiple_bin_artifacts_with_different_names_and_different_targets() {
         .file("bar/src/lib.rs", "pub fn doit() {}")
         .build();
 
-    p.cargo("check -v -Z unstable-options -Z bindeps -Z multidep")
+    p.cargo("check -v -Z bindeps -Z multidep")
         .masquerade_as_nightly_cargo()
         .with_stderr_does_not_contain(format!(
             "[RUNNING] `rustc --crate-name build_script_build build.rs [..]--target {} [..]",
@@ -2472,7 +2472,7 @@ fn different_names_to_the_same_crate_in_different_dep_kinds_with_multidep_toggle
         .file("bar/src/lib.rs", "")
         .build();
 
-    p.cargo("test -Z unstable-options -Z multidep")
+    p.cargo("test -Z multidep")
         .masquerade_as_nightly_cargo()
         .run();
 }
@@ -2503,7 +2503,7 @@ fn different_dep_names_to_the_same_crate_in_different_categories_do_not_leak_wit
         .file("bar/src/lib.rs", "")
         .build();
 
-    p.cargo("test -Z unstable-options -Z multidep")
+    p.cargo("test -Z multidep")
         .masquerade_as_nightly_cargo()
         .with_status(101)
         .with_stderr_contains("[..] can't find crate for `bar_again`")
@@ -2533,7 +2533,7 @@ fn deps_allow_renaming_the_same_resolved_version_with_multidep_toggle() {
         .file("bar/src/lib.rs", "")
         .build();
 
-    p.cargo("check -Z unstable-options -Z multidep")
+    p.cargo("check -Z multidep")
         .masquerade_as_nightly_cargo()
         .with_stderr(
             "\

diff --git a/tests/testsuite/metadata.rs b/tests/testsuite/metadata.rs
@@ -4098,7 +4098,7 @@ fn workspace_metadata_with_dependencies_and_resolve_multidep() {
         .file("non-artifact/src/lib.rs", "")
         .build();
 
-    p.cargo("metadata -Z unstable-options -Z bindeps -Z multidep")
+    p.cargo("metadata -Z bindeps -Z multidep")
         .masquerade_as_nightly_cargo()
         .with_json(
             r#"