Merge branch 'main' into names

bazelbuild · Mar 7, 2022 · 8c1095f · 8c1095f
2 parents ccea420 + 5482196
commit 8c1095f
Show file tree

Hide file tree

Showing 7 changed files with 1,457 additions and 689 deletions.
diff --git a/crate_universe/private/generate_utils.bzl b/crate_universe/private/generate_utils.bzl
@@ -63,7 +63,7 @@ def get_generator(repository_ctx, host_triple):
 
     if not generator_url:
         fail((
-            "No generator URL was found either in fro the `CARGO_BAZEL_GENERATOR_URL` " +
+            "No generator URL was found either in the `CARGO_BAZEL_GENERATOR_URL` " +
             "environment variable or for the `{}` triple in the `generator_urls` attribute"
         ).format(host_triple))
 

diff --git a/crate_universe/src/context.rs b/crate_universe/src/context.rs
@@ -487,14 +487,14 @@ mod test {
                 (
                     CrateId {
                         name: "names".to_owned(),
-                        version: "0.11.1-dev".to_owned(),
+                        version: "0.12.1-dev".to_owned(),
                     },
                     Some("pinned_names".to_owned())
                 ),
                 (
                     CrateId {
                         name: "names".to_owned(),
-                        version: "0.12.0".to_owned(),
+                        version: "0.13.0".to_owned(),
                     },
                     None
                 ),

diff --git a/crate_universe/src/rendering.rs b/crate_universe/src/rendering.rs
@@ -381,8 +381,8 @@ mod test {
 
         let build_file_content = output.get(&PathBuf::from("BUILD.bazel")).unwrap();
 
-        assert!(build_file_content.contains(r#"name = "names-0.11.1-dev__names","#));
-        assert!(build_file_content.contains(r#"name = "names-0.12.0__names","#));
+        assert!(build_file_content.contains(r#"name = "names-0.12.1-dev__names","#));
+        assert!(build_file_content.contains(r#"name = "names-0.13.0__names","#));
     }
 
     #[test]

diff --git a/crate_universe/test_data/metadata/aliases/Cargo.lock b/crate_universe/test_data/metadata/aliases/Cargo.lock
diff --git a/crate_universe/test_data/metadata/aliases/Cargo.toml b/crate_universe/test_data/metadata/aliases/Cargo.toml
@@ -1,3 +1,5 @@
+[workspace]
+
 [package]
 name = "aliases"
 version = "0.1.0"
@@ -19,5 +21,5 @@ pinned_log = { package = "log", version = "=0.3.9" }
 value-bag = "=1.0.0-alpha.7"
 
 # Defines binary targets
-names = "=0.12.0"
-pinned_names = { package = "names", git = "https://github.com/fnichol/names.git", rev = "534b1cd239fb57933616f3d25ae258bdf708811d" }
+names = "=0.13.0"
+pinned_names = { package = "names", git = "https://github.com/fnichol/names.git", rev = "760516503b89ddc8bc2ab42d579d4566cfb1054f" }