Merge pull request #1209 from nnethercote/add-new-cargo

Add `cargo-0.60.0` as a new benchmark.

Author: rylev

.github/workflows/ci.yml

@@ -64,8 +64,8 @@ jobs:
     strategy:
       matrix:
         BENCH_INCLUDE_EXCLUDE_OPTS: [
-          "--exclude webrender-wrench,cargo",
-          "--include webrender-wrench,cargo",
+          "--exclude webrender-wrench,cargo,cargo-0.60.0",
+          "--include webrender-wrench,cargo,cargo-0.60.0",
         ]
         PROFILES: [
           "Check,Doc,Debug",

collector/benchmarks/README.md

@@ -17,6 +17,8 @@ They mostly consist of real-world crates.
 
 - **cargo**: The Rust package manager. An important program in the Rust
   ecosystem.
+- **cargo-0.60.0**: The Rust package manager. A large program, and an important
+  one in the Rust ecosystem.
 - **clap-rs**: A command line argument parser. A crate used by many Rust
   programs.
 - **cranelift-codegen**: The largest crate from a code generator. Used by

collector/benchmarks/cargo-0.60.0/0-println.patch

@@ -0,0 +1,12 @@
+diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
+index cc1c9874..4abbd75e 100644
+--- a/src/cargo/sources/path.rs
++++ b/src/cargo/sources/path.rs
+@@ -54,6 +54,7 @@ impl<'cfg> PathSource<'cfg> {
+     }
+ 
+     pub fn preload_with(&mut self, pkg: Package) {
++        println!("testing");
+         assert!(!self.updated);
+         assert!(!self.recursive);
+         assert!(self.packages.is_empty());

collector/benchmarks/cargo-0.60.0/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Contributing to Cargo
+
+Contributing documentation has moved to the **[Cargo Contributor Guide]**.
+
+[Cargo Contributor Guide]: https://rust-lang.github.io/cargo/contrib/