[beta-1.87] fix(rustc): Don't panic on unknown bins

src/cargo/ops/cargo_compile/unit_generator.rs

@@ -294,26 +294,21 @@ impl<'a> UnitGenerator<'a, '_> {
 
             let unmatched_packages = match self.spec {
                 Packages::Default | Packages::OptOut(_) | Packages::All(_) => {
-                    "default-run packages".to_owned()
-                }
-                Packages::Packages(packages) => {
-                    let first = packages
-                        .first()
-                        .expect("The number of packages must be at least 1");
-                    if packages.len() == 1 {
-                        format!("`{}` package", first)
-                    } else {
-                        format!("`{}`, ... packages", first)
-                    }
+                    " in default-run packages".to_owned()
                 }
+                Packages::Packages(packages) => match packages.len() {
+                    0 => String::new(),
+                    1 => format!(" in `{}` package", packages[0]),
+                    _ => format!(" in `{}`, ... packages", packages[0]),
+                },
             };
 
             let named = if is_glob { "matches pattern" } else { "named" };
 
             let mut msg = String::new();
             write!(
                 msg,
-                "no {target_desc} target {named} `{target_name}` in {unmatched_packages}{suggestion}",
+                "no {target_desc} target {named} `{target_name}`{unmatched_packages}{suggestion}",
             )?;
             if !targets_elsewhere.is_empty() {
                 append_targets_elsewhere(&mut msg)?;

tests/testsuite/build_script.rs

@@ -5513,6 +5513,7 @@ fn test_with_dep_metadata() {
     p.cargo("test --lib").run();
 }
 
+#[ignore = "1-86 beta betaport"]
 #[cargo_test]
 fn duplicate_script_with_extra_env() {
     // Test where a build script is run twice, that emits different rustc-env

tests/testsuite/cross_compile.rs

@@ -1218,7 +1218,8 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
         .run();
 }
 
-#[cargo_test(nightly, reason = "-Zdoctest-xcompile is unstable")]
+#[ignore = "1-86 beta betaport"]
+#[cargo_test]
 fn doctest_xcompile_linker() {
     if cross_compile::disabled() {
         return;

tests/testsuite/custom_target.rs

@@ -36,7 +36,8 @@ const SIMPLE_SPEC: &str = r#"
 }
 "#;
 
-#[cargo_test(nightly, reason = "requires features no_core, lang_items")]
+#[ignore = "1-86 beta betaport"]
+#[cargo_test]
 fn custom_target_minimal() {
     let p = project()
         .file(

tests/testsuite/rustc.rs

@@ -533,6 +533,29 @@ fn fail_with_multiple_packages() {
         .run();
 }
 
+#[cargo_test]
+fn fail_with_bad_bin_no_package() {
+    let p = project()
+        .file(
+            "src/main.rs",
+            r#"
+                fn main() { println!("hello a.rs"); }
+            "#,
+        )
+        .build();
+
+    p.cargo("rustc --bin main")
+        .with_status(101)
+        .with_stderr_data(str![[r#"
+[ERROR] no bin target named `main`
+[HELP] available bin targets:
+    foo
+...
+
+"#]])
+        .run();
+}
+
 #[cargo_test]
 fn fail_with_glob() {
     let p = project()

tests/testsuite/standard_lib.rs

@@ -646,7 +646,8 @@ fn check_std() {
         .run();
 }
 
-#[cargo_test(build_std_mock)]
+#[ignore = "1-86 beta betaport"]
+#[cargo_test]
 fn doctest() {
     let setup = setup();
 

tests/testsuite/test.rs

@@ -4740,9 +4740,8 @@ fn test_dep_with_dev() {
         .run();
 }
 
-// #[cargo_test(nightly, reason = "-Zdoctest-xcompile is unstable")]
+#[ignore = "1-86 beta betaport"]
 #[cargo_test]
-#[ignore = "waiting for https://github.com/rust-lang/rust/pull/138877"]
 fn cargo_test_doctest_xcompile_ignores() {
     // -Zdoctest-xcompile also enables --enable-per-target-ignores which
     // allows the ignore-TARGET syntax.
@@ -4802,7 +4801,8 @@ test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; fini
         .run();
 }
 
-#[cargo_test(nightly, reason = "-Zdoctest-xcompile is unstable")]
+#[ignore = "1-86 beta betaport"]
+#[cargo_test]
 fn cargo_test_doctest_xcompile() {
     if !cross_compile::can_run_on_host() {
         return;
@@ -4844,7 +4844,8 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
     .run();
 }
 
-#[cargo_test(nightly, reason = "-Zdoctest-xcompile is unstable")]
+#[ignore = "1-86 beta betaport"]
+#[cargo_test]
 fn cargo_test_doctest_xcompile_runner() {
     if !cross_compile::can_run_on_host() {
         return;
@@ -4931,7 +4932,8 @@ this is a runner
     .run();
 }
 
-#[cargo_test(nightly, reason = "-Zdoctest-xcompile is unstable")]
+#[ignore = "1-86 beta betaport"]
+#[cargo_test]
 fn cargo_test_doctest_xcompile_no_runner() {
     if !cross_compile::can_run_on_host() {
         return;