Updated Rust to 1.60.0 (#1247)

* Updated Rust to 1.60.0 * Regenerate documentation * Updated `crate_universe` lockfiles
bazelbuild · Apr 10, 2022 · 5579049 · 5579049
1 parent b594f90
commit 5579049
Show file tree

Hide file tree

Showing 13 changed files with 157 additions and 38 deletions.
diff --git a/crate_universe/Cargo.Bazel.lock b/crate_universe/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "0a6242f7bd2ce6f7adf071110f944b64f30020876270fa45dad1f3ab2a949953",
+  "checksum": "85a3a4059334d92caae913a040b06e76645d20953912aefa92aefad0d51e8710",
   "crates": {
     "aho-corasick 0.7.18": {
       "name": "aho-corasick",

diff --git a/docs/cargo.md b/docs/cargo.md
@@ -37,7 +37,7 @@ A rule for bootstrapping a Rust binary using [Cargo](https://doc.rust-lang.org/c
 | <a id="cargo_bootstrap_repository-rust_toolchain_rustc_template"></a>rust_toolchain_rustc_template |  The template to use for finding the host <code>rustc</code> binary. <code>{version}</code> (eg. '1.53.0'), <code>{triple}</code> (eg. 'x86_64-unknown-linux-gnu'), <code>{arch}</code> (eg. 'aarch64'), <code>{vendor}</code> (eg. 'unknown'), <code>{system}</code> (eg. 'darwin'), and <code>{tool}</code> (eg. 'rustc.exe') will be replaced in the string if present.   | String | optional | "@rust_{system}_{arch}//:bin/{tool}" |
 | <a id="cargo_bootstrap_repository-srcs"></a>srcs |  Souce files of the crate to build. Passing source files here can be used to trigger rebuilds when changes are made   | <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a> | optional | [] |
 | <a id="cargo_bootstrap_repository-timeout"></a>timeout |  Maximum duration of the Cargo build command in seconds   | Integer | optional | 600 |
-| <a id="cargo_bootstrap_repository-version"></a>version |  The version of cargo the resolver should use   | String | optional | "1.59.0" |
+| <a id="cargo_bootstrap_repository-version"></a>version |  The version of cargo the resolver should use   | String | optional | "1.60.0" |
 
 
 <a id="#cargo_build_script"></a>

diff --git a/docs/crate_universe.md b/docs/crate_universe.md
@@ -212,7 +212,7 @@ Environment Variables:
 | <a id="crates_repository-repo_mapping"></a>repo_mapping |  A dictionary from local repository name to global repository name. This allows controls over workspace dependency resolution for dependencies of this repository.&lt;p&gt;For example, an entry <code>"@foo": "@bar"</code> declares that, for any time this repository depends on <code>@foo</code> (such as a dependency on <code>@foo//some:target</code>, it should actually resolve that dependency within globally-declared <code>@bar</code> (<code>@bar//some:target</code>).   | <a href="https://bazel.build/docs/skylark/lib/dict.html">Dictionary: String -> String</a> | required |  |
 | <a id="crates_repository-rust_toolchain_cargo_template"></a>rust_toolchain_cargo_template |  The template to use for finding the host <code>cargo</code> binary. <code>{version}</code> (eg. '1.53.0'), <code>{triple}</code> (eg. 'x86_64-unknown-linux-gnu'), <code>{arch}</code> (eg. 'aarch64'), <code>{vendor}</code> (eg. 'unknown'), <code>{system}</code> (eg. 'darwin'), <code>{cfg}</code> (eg. 'exec'), and <code>{tool}</code> (eg. 'rustc.exe') will be replaced in the string if present.   | String | optional | "@rust_{system}_{arch}//:bin/{tool}" |
 | <a id="crates_repository-rust_toolchain_rustc_template"></a>rust_toolchain_rustc_template |  The template to use for finding the host <code>rustc</code> binary. <code>{version}</code> (eg. '1.53.0'), <code>{triple}</code> (eg. 'x86_64-unknown-linux-gnu'), <code>{arch}</code> (eg. 'aarch64'), <code>{vendor}</code> (eg. 'unknown'), <code>{system}</code> (eg. 'darwin'), <code>{cfg}</code> (eg. 'exec'), and <code>{tool}</code> (eg. 'cargo.exe') will be replaced in the string if present.   | String | optional | "@rust_{system}_{arch}//:bin/{tool}" |
-| <a id="crates_repository-rust_version"></a>rust_version |  The version of Rust the currently registered toolchain is using. Eg. <code>1.56.0</code>, or <code>nightly-2021-09-08</code>   | String | optional | "1.59.0" |
+| <a id="crates_repository-rust_version"></a>rust_version |  The version of Rust the currently registered toolchain is using. Eg. <code>1.56.0</code>, or <code>nightly-2021-09-08</code>   | String | optional | "1.60.0" |
 | <a id="crates_repository-splicing_config"></a>splicing_config |  The configuration flags to use for splicing Cargo maniests. Use <code>//crate_universe:defs.bzl\%rsplicing_config</code> to generate the value for this field. If unset, the defaults defined there will be used.   | String | optional | "" |
 | <a id="crates_repository-supported_platform_triples"></a>supported_platform_triples |  A set of all platform triples to consider when generating dependencies.   | List of strings | optional | ["i686-apple-darwin", "i686-pc-windows-msvc", "i686-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-unknown-linux-gnueabi", "i686-linux-android", "i686-unknown-freebsd", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "wasm32-unknown-unknown", "wasm32-wasi", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd"] |
 
@@ -367,7 +367,7 @@ Define dependencies of the `cargo-bazel` Rust target
 
 | Name  | Description | Default Value |
 | :------------- | :------------- | :------------- |
-| <a id="crate_universe_dependencies-rust_version"></a>rust_version |  The version of rust to use when generating dependencies.   |  <code>"1.59.0"</code> |
+| <a id="crate_universe_dependencies-rust_version"></a>rust_version |  The version of rust to use when generating dependencies.   |  <code>"1.60.0"</code> |
 | <a id="crate_universe_dependencies-bootstrap"></a>bootstrap |  If true, a <code>cargo_bootstrap_repository</code> target will be generated.   |  <code>False</code> |
 
 

diff --git a/docs/flatten.md b/docs/flatten.md
@@ -98,7 +98,7 @@ A rule for bootstrapping a Rust binary using [Cargo](https://doc.rust-lang.org/c
 | <a id="cargo_bootstrap_repository-rust_toolchain_rustc_template"></a>rust_toolchain_rustc_template |  The template to use for finding the host <code>rustc</code> binary. <code>{version}</code> (eg. '1.53.0'), <code>{triple}</code> (eg. 'x86_64-unknown-linux-gnu'), <code>{arch}</code> (eg. 'aarch64'), <code>{vendor}</code> (eg. 'unknown'), <code>{system}</code> (eg. 'darwin'), and <code>{tool}</code> (eg. 'rustc.exe') will be replaced in the string if present.   | String | optional | "@rust_{system}_{arch}//:bin/{tool}" |
 | <a id="cargo_bootstrap_repository-srcs"></a>srcs |  Souce files of the crate to build. Passing source files here can be used to trigger rebuilds when changes are made   | <a href="https://bazel.build/docs/build-ref.html#labels">List of labels</a> | optional | [] |
 | <a id="cargo_bootstrap_repository-timeout"></a>timeout |  Maximum duration of the Cargo build command in seconds   | Integer | optional | 600 |
-| <a id="cargo_bootstrap_repository-version"></a>version |  The version of cargo the resolver should use   | String | optional | "1.59.0" |
+| <a id="cargo_bootstrap_repository-version"></a>version |  The version of cargo the resolver should use   | String | optional | "1.60.0" |
 
 
 <a id="#error_format"></a>

diff --git a/examples/crate_universe/cargo_aliases/Cargo.Bazel.lock b/examples/crate_universe/cargo_aliases/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "a114fa1a49ce5b93d08ce526ec77584705fa0e71d3810b85b6afb35db8cbff95",
+  "checksum": "9ad48990a8663e815687344f038d7a5f809b2c5697e6bc0c5743814b0602587f",
   "crates": {
     "aho-corasick 0.7.18": {
       "name": "aho-corasick",

diff --git a/examples/crate_universe/cargo_workspace/Cargo.Bazel.lock b/examples/crate_universe/cargo_workspace/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "5a2c3273614bb677a90c62917d21d339c43d36808d7248a24b4b3eb183fae4ee",
+  "checksum": "8821fea6b6cb36398a73044fedda8c07079cb7805c4da2f713c515329d157060",
   "crates": {
     "ansi_term 0.12.1": {
       "name": "ansi_term",

diff --git a/examples/crate_universe/extra_workspace_members/Cargo.Bazel.lock b/examples/crate_universe/extra_workspace_members/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "ffefc431b4beda07270e75284be07d280fba62608e89b253c129f384e32d994b",
+  "checksum": "261553cf6429e8b335c0e0b5b40d50bde214a6e803050916a1ce08a9b54c7da5",
   "crates": {
     "adler32 1.2.0": {
       "name": "adler32",

diff --git a/examples/crate_universe/multi_package/Cargo.Bazel.lock b/examples/crate_universe/multi_package/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "a0fb85aec3e72e155508fd755dd80ec38fac9f27bebe620c44c4109a9319ba1c",
+  "checksum": "90b9c257f171dc9e59d7ef965338906459e097f90614c213ad8ee023ef0b8474",
   "crates": {
     "aho-corasick 0.7.18": {
       "name": "aho-corasick",
@@ -3496,7 +3496,7 @@
               "target": "tokio_util"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             }
           ],
@@ -4055,7 +4055,7 @@
               "target": "tower_service"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             },
             {
@@ -4446,7 +4446,7 @@
               "target": "sluice"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             },
             {
@@ -9139,7 +9139,7 @@
               "target": "tokio"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             }
           ],
@@ -9183,13 +9183,13 @@
       },
       "license": "MIT"
     },
-    "tracing 0.1.32": {
+    "tracing 0.1.33": {
       "name": "tracing",
-      "version": "0.1.32",
+      "version": "0.1.33",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/tracing/0.1.32/download",
-          "sha256": "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
+          "url": "https://crates.io/api/v1/crates/tracing/0.1.33/download",
+          "sha256": "80b9fa4360528139bc96100c160b7ae879f5567f49f1782b0b02035b0358ebf3"
         }
       },
       "targets": [
@@ -9249,7 +9249,7 @@
           ],
           "selects": {}
         },
-        "version": "0.1.32"
+        "version": "0.1.33"
       },
       "license": "MIT"
     },
@@ -9389,7 +9389,7 @@
               "target": "pin_project"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             }
           ],

diff --git a/examples/crate_universe/no_cargo_manifests/Cargo.Bazel.lock b/examples/crate_universe/no_cargo_manifests/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "3a7b41c8aa6d72b38ee436a36986bd86ead405ee1453bf34239ef7396bbf44e1",
+  "checksum": "e363b114bfca318daf2672f5264190592878fe5d1826d721ea18d1508bbd578d",
   "crates": {
     "ansi_term 0.12.1": {
       "name": "ansi_term",
@@ -515,11 +515,11 @@
               "target": "tower_http"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             },
             {
-              "id": "tracing-subscriber 0.3.10",
+              "id": "tracing-subscriber 0.3.11",
               "target": "tracing_subscriber"
             }
           ],
@@ -994,7 +994,7 @@
               "target": "tokio_util"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             }
           ],
@@ -1415,7 +1415,7 @@
               "target": "tower_service"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             },
             {
@@ -3548,7 +3548,7 @@
               "target": "tokio"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             }
           ],
@@ -3637,7 +3637,7 @@
               "target": "tower_service"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             }
           ],
@@ -3731,7 +3731,7 @@
               "target": "tower_service"
             },
             {
-              "id": "tracing 0.1.32",
+              "id": "tracing 0.1.33",
               "target": "tracing"
             }
           ],
@@ -3808,13 +3808,13 @@
       },
       "license": "MIT"
     },
-    "tracing 0.1.32": {
+    "tracing 0.1.33": {
       "name": "tracing",
-      "version": "0.1.32",
+      "version": "0.1.33",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/tracing/0.1.32/download",
-          "sha256": "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
+          "url": "https://crates.io/api/v1/crates/tracing/0.1.33/download",
+          "sha256": "80b9fa4360528139bc96100c160b7ae879f5567f49f1782b0b02035b0358ebf3"
         }
       },
       "targets": [
@@ -3874,7 +3874,7 @@
           ],
           "selects": {}
         },
-        "version": "0.1.32"
+        "version": "0.1.33"
       },
       "license": "MIT"
     },
@@ -4037,13 +4037,13 @@
       },
       "license": "MIT"
     },
-    "tracing-subscriber 0.3.10": {
+    "tracing-subscriber 0.3.11": {
       "name": "tracing-subscriber",
-      "version": "0.3.10",
+      "version": "0.3.11",
       "repository": {
         "Http": {
-          "url": "https://crates.io/api/v1/crates/tracing-subscriber/0.3.10/download",
-          "sha256": "b9df98b037d039d03400d9dd06b0f8ce05486b5f25e9a2d7d36196e142ebbc52"
+          "url": "https://crates.io/api/v1/crates/tracing-subscriber/0.3.11/download",
+          "sha256": "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
         }
       },
       "targets": [
@@ -4108,7 +4108,7 @@
           "selects": {}
         },
         "edition": "2018",
-        "version": "0.3.10"
+        "version": "0.3.11"
       },
       "license": "MIT"
     },