rename workspace-hack to guppy-workspace-hack

Unfortunately, cargo has a few bugs: facebookarchive/cargo-guppy#524
sunshowers · Dec 8, 2021 · bdd9d77 · bdd9d77
1 parent 5b7c77b
commit bdd9d77
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 53 deletions.
diff --git a/.config/hakari.toml b/.config/hakari.toml
@@ -1,7 +1,7 @@
 # This file contains settings for `cargo hakari`.
 # See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options.
 
-hakari-package = "workspace-hack"
+hakari-package = "guppy-workspace-hack"
 
 # Setting workspace.resolver = "2" in the root Cargo.toml is HIGHLY recommended.
 # Hakari works much better with the new feature resolver.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-guppy/Cargo.toml b/cargo-guppy/Cargo.toml
@@ -18,4 +18,4 @@ serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.72"
 structopt = "0.3.25"
 toml_edit = "0.10.1"
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/fixtures/Cargo.toml b/fixtures/Cargo.toml
@@ -11,4 +11,4 @@ guppy = { path = "../guppy" }
 once_cell = "1.8.0"
 pathdiff = "0.2.0"
 pretty_assertions = "1.0.0"
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/guppy-cmdlib/Cargo.toml b/guppy-cmdlib/Cargo.toml
@@ -12,7 +12,7 @@ anyhow = "1.0.44"
 guppy = { path = "../guppy" }
 structopt = "0.3.25"
 proptest = { version = "1.0.0", optional = true }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [features]
 proptest1 = ["proptest", "guppy/proptest1"]
diff --git a/guppy-summaries/Cargo.toml b/guppy-summaries/Cargo.toml
@@ -22,7 +22,7 @@ diffus = "0.10.0"
 toml = { version = "0.5.8", features = ["preserve_order"] }
 semver = { version = "1.0.4", features = ["serde"] }
 serde = { version = "1.0.130", features = ["derive"] }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 pretty_assertions = "1.0.0"

diff --git a/guppy/Cargo.toml b/guppy/Cargo.toml
@@ -53,7 +53,7 @@ serde_json = "1.0.72"
 smallvec = "1.7.0"
 target-spec = { version = "0.9.0", path = "../target-spec" }
 toml = { version = "0.5.8", optional = true, features = ["preserve_order"] }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 fixtures = { path = "../fixtures" }

diff --git a/internal-tools/benchmarks/Cargo.toml b/internal-tools/benchmarks/Cargo.toml
@@ -9,7 +9,7 @@ publish = false  # this is a private crate
 guppy = { path = "../../guppy", features = ["proptest1"] }
 proptest = "1.0.0"
 proptest-ext = { path = "../proptest-ext" }
-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
 
 [dev-dependencies]
 criterion = "0.3.5"

diff --git a/internal-tools/fixture-manager/Cargo.toml b/internal-tools/fixture-manager/Cargo.toml
@@ -18,4 +18,4 @@ once_cell = "1.8.0"
 proptest = "1.0.0"
 proptest-ext = { path = "../proptest-ext" }
 structopt = "0.3.25"
-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
diff --git a/internal-tools/proptest-ext/Cargo.toml b/internal-tools/proptest-ext/Cargo.toml
@@ -10,4 +10,4 @@ publish = false  # this is a private crate
 [dependencies]
 proptest = "1.0.0"
 twox-hash = { version = "1.6.1", default-features = false }
-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
diff --git a/target-spec/Cargo.toml b/target-spec/Cargo.toml
@@ -22,7 +22,7 @@ cfg-expr = { version = "0.9.0", features = ["targets"] }
 proptest = { version = "1.0.0", optional = true }
 serde = { version = "1.0.130", optional = true, features = ["derive"] }
 target-lexicon = { version = "0.12.2", features = ["std"] }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 [dev-dependencies]
 toml = "0.5.8"

diff --git a/tools/cargo-hakari/Cargo.toml b/tools/cargo-hakari/Cargo.toml
@@ -33,7 +33,7 @@ log = "0.4.14"
 owo-colors = { version = "3.1.0", features = ["supports-colors"] }
 supports-color = "1.3.0"
 structopt = "0.3.25"
-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
 
 [dev-dependencies]
 tempfile = "3.2.0"
diff --git a/tools/determinator/Cargo.toml b/tools/determinator/Cargo.toml
@@ -36,7 +36,7 @@ petgraph = { version = "0.6.0", default-features = false, features = ["graphmap"
 rayon = "1.5.1"
 serde = { version = "1.0.130", features = ["derive"] }
 toml = "0.5.8"
-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
 
 [dev-dependencies]
 fixtures = { path = "../../fixtures" }

diff --git a/tools/hakari/Cargo.toml b/tools/hakari/Cargo.toml
@@ -43,7 +43,7 @@ target-spec = { version = "0.9.0", path = "../../target-spec" }
 toml = { version = "0.5.8", optional = true }
 toml_edit = "0.10.1"
 twox-hash = { version = "1.6.1", default-features = false }
-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
+guppy-workspace-hack = { version = "0.1", path = "../../workspace-hack" }
 
 [dev-dependencies]
 fixtures = { path = "../../fixtures" }

diff --git a/tools/hakari/README.md b/tools/hakari/README.md
@@ -17,7 +17,8 @@ let package_graph = MetadataCommand::new()
     .expect("obtained cargo-guppy's PackageGraph");
 
 // The second argument to HakariBuilder::new specifies a Hakari (workspace-hack) package.
-let hakari_package = package_graph.workspace().member_by_name("workspace-hack").unwrap().id();
+// In this repository, the package is called "guppy-workspace-hack".
+let hakari_package = package_graph.workspace().member_by_name("guppy-workspace-hack").unwrap().id();
 let hakari_builder = HakariBuilder::new(&package_graph, Some(hakari_package))
     .expect("HakariBuilder was constructed");
 

diff --git a/tools/hakari/src/lib.rs b/tools/hakari/src/lib.rs
@@ -18,7 +18,8 @@
 //!     .expect("obtained cargo-guppy's PackageGraph");
 //!
 //! // The second argument to HakariBuilder::new specifies a Hakari (workspace-hack) package.
-//! let hakari_package = package_graph.workspace().member_by_name("workspace-hack").unwrap().id();
+//! // In this repository, the package is called "guppy-workspace-hack".
+//! let hakari_package = package_graph.workspace().member_by_name("guppy-workspace-hack").unwrap().id();
 //! let hakari_builder = HakariBuilder::new(&package_graph, Some(hakari_package))
 //!     .expect("HakariBuilder was constructed");
 //!

diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
@@ -3,7 +3,7 @@
 #     cargo hakari generate
 
 [package]
-name = "workspace-hack"
+name = "guppy-workspace-hack"
 version = "0.1.0"
 description = "workspace-hack package, managed by hakari"
 publish = true