Fix test-cargo-miri

Author: bjorn3

src/bin/miri.rs

@@ -121,6 +121,13 @@ fn entry_fn(tcx: TyCtxt<'_>) -> (DefId, MiriEntryFnType) {
 }
 
 impl rustc_driver::Callbacks for MiriCompilerCalls {
+    fn config(&mut self, config: &mut rustc_interface::interface::Config) {
+        if config.opts.prints.is_empty() {
+            #[allow(rustc::bad_opt_access)]
+            config.opts.crate_types.retain(|&c| c == CrateType::Executable || c == CrateType::Rlib);
+        }
+    }
+
     fn after_analysis<'tcx>(
         &mut self,
         _: &rustc_interface::interface::Compiler,
@@ -233,6 +240,10 @@ impl rustc_driver::Callbacks for MiriBeRustCompilerCalls {
     #[allow(rustc::potential_query_instability)] // rustc_codegen_ssa (where this code is copied from) also allows this lint
     fn config(&mut self, config: &mut Config) {
         if config.opts.prints.is_empty() && self.target_crate {
+            // Avoid warnings about unsupported crate types
+            #[allow(rustc::bad_opt_access)]
+            config.opts.crate_types.retain(|&c| c == CrateType::Executable || c == CrateType::Rlib);
+
             // Queries overridden here affect the data stored in `rmeta` files of dependencies,
             // which will be used later in non-`MIRI_BE_RUSTC` mode.
             config.override_queries = Some(|_, local_providers| {

test-cargo-miri/Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["subcrate", "issue-1567", "exported-symbol-dep", "test-local-crate-detection"]
+members = ["cdylib", "subcrate", "issue-1567", "exported-symbol-dep", "test-local-crate-detection"]
 exclude = ["no-std-smoke"] # it wants to be panic="abort"
 
 [package]
@@ -10,7 +10,6 @@ edition = "2024"
 
 [dependencies]
 byteorder = "1.0"
-cdylib = { path = "cdylib" }
 exported_symbol = { path = "exported-symbol" }
 proc_macro_crate = { path = "proc-macro-crate" }
 issue_1567 = { path = "issue-1567" }

test-cargo-miri/Cargo.toml

@@ -1 +1 @@
-subcrate,issue_1567,exported_symbol_dep,test_local_crate_detection,cargo_miri_test,cdylib,exported_symbol,issue_1691,issue_1705,issue_rust_86261,proc_macro_crate
+cdylib,subcrate,issue_1567,exported_symbol_dep,test_local_crate_detection,cargo_miri_test,exported_symbol,issue_1691,issue_1705,issue_rust_86261,proc_macro_crate