Auto merge of #3035 - RalfJung:serde, r=RalfJung

bump serde

bump to a version with the binary blob removed

also, respect CARGO_EXTRA_FLAGS in more places

Author: bors

Cargo.lock

@@ -41,8 +41,8 @@ rustc_version = "0.4"
 # Features chosen to match those required by env_logger, to avoid rebuilds
 regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }
 lazy_static = "1.4.0"
-# Pin a version of serde without intransparent unreproducible binary blobs.
-serde = { version = "1.0, < 1.0.172", features = ["derive"] }
+# Require a version of serde without intransparent unreproducible binary blobs.
+serde = { version = "1.0.185", features = ["derive"] }
 
 [package.metadata.rust-analyzer]
 # This crate uses #[feature(rustc_private)].

Cargo.toml

@@ -22,8 +22,8 @@ rustc-build-sysroot = "0.4.1"
 
 # Enable some feature flags that dev-dependencies need but dependencies
 # do not.  This makes `./miri install` after `./miri build` faster.
-# Pin a version of serde without intransparent unreproducible binary blobs.
-serde = { version = "1.0, < 1.0.172", features = ["derive"] }
+# Require a version of serde without intransparent unreproducible binary blobs.
+serde = { version = "1.0.185", features = ["derive"] }
 
 [build-dependencies]
 rustc_tools_util = "0.3"

cargo-miri/Cargo.lock

@@ -52,7 +52,7 @@ function run_tests {
 
     # Also run some many-seeds tests. 64 seeds means this takes around a minute per test.
     for FILE in tests/many-seeds/*.rs; do
-      MIRI_SEEDS=64 CARGO_EXTRA_FLAGS="$CARGO_EXTRA_FLAGS -q" ./miri many-seeds ./miri run "$FILE"
+      MIRI_SEEDS=64 ./miri many-seeds ./miri run "$FILE"
     done
 
     # Check that the benchmarks build and run, but without actually benchmarking.

cargo-miri/Cargo.toml

@@ -2,5 +2,5 @@
 set -e
 # Instead of doing just `cargo run --manifest-path .. $@`, we invoke miri-script binary directly. Invoking `cargo run` goes through
 # rustup (that sets it's own environmental variables), which is undesirable.
-cargo build -q --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml
+cargo build $CARGO_EXTRA_FLAGS -q --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml
 "$(dirname "$0")"/miri-script/target/debug/miri-script "$@"

ci.sh

@@ -319,6 +319,8 @@ impl Command {
         let Some((program_name, args)) = hyperfine.split_first() else {
             bail!("expected HYPERFINE environment variable to be non-empty");
         };
+        // Extra flags to pass to cargo.
+        let cargo_extra_flags = std::env::var("CARGO_EXTRA_FLAGS").unwrap_or_default();
         // Make sure we have an up-to-date Miri installed and selected the right toolchain.
         Self::install(vec![])?;
 
@@ -341,7 +343,7 @@ impl Command {
             // That seems to make Windows CI happy.
             cmd!(
                 sh,
-                "{program_name} {args...} 'cargo miri run --manifest-path \"'{current_bench}'\"'"
+                "{program_name} {args...} 'cargo miri run '{cargo_extra_flags}' --manifest-path \"'{current_bench}'\"'"
             )
             .run()?;
         }

miri

@@ -21,8 +21,7 @@ issue_rust_86261 = { path = "issue-rust-86261" }
 [dev-dependencies]
 byteorder_2 = { package = "byteorder", version = "0.5" } # to test dev-dependencies behave as expected, with renaming
 # Not actually used, but exercises some unique code path (`--extern` .so file).
-# Pin a version without intransparent unreproducible binary blobs.
-serde_derive = "=1.0.152"
+serde_derive = "1.0.185"
 
 [build-dependencies]
 autocfg = "1"

miri-script/src/commands.rs

@@ -15,12 +15,14 @@
 CBOLD   = '\33[1m'
 CEND    = '\33[0m'
 
+CARGO_EXTRA_FLAGS = os.environ.get("CARGO_EXTRA_FLAGS", "").split()
+
 def fail(msg):
     print("\nTEST FAIL: {}".format(msg))
     sys.exit(1)
 
 def cargo_miri(cmd, quiet = True):
-    args = ["cargo", "miri", cmd]
+    args = ["cargo", "miri", cmd] + CARGO_EXTRA_FLAGS
     if quiet:
         args += ["-q"]
     if 'MIRI_TEST_TARGET' in os.environ:

test-cargo-miri/Cargo.lock

@@ -16,6 +16,11 @@ fn get_host() -> String {
         .host
 }
 
+pub fn flagsplit(flags: &str) -> Vec<String> {
+    // This code is taken from `RUSTFLAGS` handling in cargo.
+    flags.split(' ').map(str::trim).filter(|s| !s.is_empty()).map(str::to_string).collect()
+}
+
 // Build the shared object file for testing external C function calls.
 fn build_so_for_c_ffi_tests() -> PathBuf {
     let cc = option_env!("CC").unwrap_or("cc");
@@ -100,14 +105,16 @@ fn test_config(target: &str, path: &str, mode: Mode, with_dependencies: bool) ->
     if with_dependencies && use_std {
         config.dependencies_crate_manifest_path =
             Some(Path::new("test_dependencies").join("Cargo.toml"));
-        config.dependency_builder.args = vec![
-            "run".into(),
+        let mut builder_args = vec!["run".into()];
+        builder_args.extend(flagsplit(&env::var("CARGO_EXTRA_FLAGS").unwrap_or_default()));
+        builder_args.extend([
             "--manifest-path".into(),
             "cargo-miri/Cargo.toml".into(),
             "--".into(),
             "miri".into(),
             "run".into(), // There is no `cargo miri build` so we just use `cargo miri run`.
-        ];
+        ]);
+        config.dependency_builder.args = builder_args.into_iter().map(Into::into).collect();
     }
     config
 }