Skip to content

Commit 5579049

Browse files
UebelAndreUebelAndre
authored
Updated Rust to 1.60.0 (#1247)
* Updated Rust to 1.60.0 * Regenerate documentation * Updated `crate_universe` lockfiles
1 parent b594f90 commit 5579049

File tree

13 files changed

+157
-38
lines changed

13 files changed

+157
-38
lines changed

‎crate_universe/Cargo.Bazel.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "0a6242f7bd2ce6f7adf071110f944b64f30020876270fa45dad1f3ab2a949953",
2+
"checksum": "85a3a4059334d92caae913a040b06e76645d20953912aefa92aefad0d51e8710",
33
"crates": {
44
"aho-corasick 0.7.18": {
55
"name": "aho-corasick",

‎docs/cargo.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ A rule for bootstrapping a Rust binary using [Cargo](https://doc.rust-lang.org/c
3737
| <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}" |
3838
| <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 | [] |
3939
| <a id="cargo_bootstrap_repository-timeout"></a>timeout | Maximum duration of the Cargo build command in seconds | Integer | optional | 600 |
40-
| <a id="cargo_bootstrap_repository-version"></a>version | The version of cargo the resolver should use | String | optional | "1.59.0" |
40+
| <a id="cargo_bootstrap_repository-version"></a>version | The version of cargo the resolver should use | String | optional | "1.60.0" |
4141

4242

4343
<a id="#cargo_build_script"></a>

‎docs/crate_universe.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ Environment Variables:
212212
| <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 | |
213213
| <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}" |
214214
| <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}" |
215-
| <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" |
215+
| <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" |
216216
| <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 | "" |
217217
| <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"] |
218218

@@ -367,7 +367,7 @@ Define dependencies of the `cargo-bazel` Rust target
367367

368368
| Name | Description | Default Value |
369369
| :------------- | :------------- | :------------- |
370-
| <a id="crate_universe_dependencies-rust_version"></a>rust_version | The version of rust to use when generating dependencies. | <code>"1.59.0"</code> |
370+
| <a id="crate_universe_dependencies-rust_version"></a>rust_version | The version of rust to use when generating dependencies. | <code>"1.60.0"</code> |
371371
| <a id="crate_universe_dependencies-bootstrap"></a>bootstrap | If true, a <code>cargo_bootstrap_repository</code> target will be generated. | <code>False</code> |
372372

373373

‎docs/flatten.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ A rule for bootstrapping a Rust binary using [Cargo](https://doc.rust-lang.org/c
9898
| <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}" |
9999
| <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 | [] |
100100
| <a id="cargo_bootstrap_repository-timeout"></a>timeout | Maximum duration of the Cargo build command in seconds | Integer | optional | 600 |
101-
| <a id="cargo_bootstrap_repository-version"></a>version | The version of cargo the resolver should use | String | optional | "1.59.0" |
101+
| <a id="cargo_bootstrap_repository-version"></a>version | The version of cargo the resolver should use | String | optional | "1.60.0" |
102102

103103

104104
<a id="#error_format"></a>

‎examples/crate_universe/cargo_aliases/Cargo.Bazel.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "a114fa1a49ce5b93d08ce526ec77584705fa0e71d3810b85b6afb35db8cbff95",
2+
"checksum": "9ad48990a8663e815687344f038d7a5f809b2c5697e6bc0c5743814b0602587f",
33
"crates": {
44
"aho-corasick 0.7.18": {
55
"name": "aho-corasick",

‎examples/crate_universe/cargo_workspace/Cargo.Bazel.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "5a2c3273614bb677a90c62917d21d339c43d36808d7248a24b4b3eb183fae4ee",
2+
"checksum": "8821fea6b6cb36398a73044fedda8c07079cb7805c4da2f713c515329d157060",
33
"crates": {
44
"ansi_term 0.12.1": {
55
"name": "ansi_term",

‎examples/crate_universe/extra_workspace_members/Cargo.Bazel.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "ffefc431b4beda07270e75284be07d280fba62608e89b253c129f384e32d994b",
2+
"checksum": "261553cf6429e8b335c0e0b5b40d50bde214a6e803050916a1ce08a9b54c7da5",
33
"crates": {
44
"adler32 1.2.0": {
55
"name": "adler32",

‎examples/crate_universe/multi_package/Cargo.Bazel.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "a0fb85aec3e72e155508fd755dd80ec38fac9f27bebe620c44c4109a9319ba1c",
2+
"checksum": "90b9c257f171dc9e59d7ef965338906459e097f90614c213ad8ee023ef0b8474",
33
"crates": {
44
"aho-corasick 0.7.18": {
55
"name": "aho-corasick",
@@ -3496,7 +3496,7 @@
34963496
"target": "tokio_util"
34973497
},
34983498
{
3499-
"id": "tracing 0.1.32",
3499+
"id": "tracing 0.1.33",
35003500
"target": "tracing"
35013501
}
35023502
],
@@ -4055,7 +4055,7 @@
40554055
"target": "tower_service"
40564056
},
40574057
{
4058-
"id": "tracing 0.1.32",
4058+
"id": "tracing 0.1.33",
40594059
"target": "tracing"
40604060
},
40614061
{
@@ -4446,7 +4446,7 @@
44464446
"target": "sluice"
44474447
},
44484448
{
4449-
"id": "tracing 0.1.32",
4449+
"id": "tracing 0.1.33",
44504450
"target": "tracing"
44514451
},
44524452
{
@@ -9139,7 +9139,7 @@
91399139
"target": "tokio"
91409140
},
91419141
{
9142-
"id": "tracing 0.1.32",
9142+
"id": "tracing 0.1.33",
91439143
"target": "tracing"
91449144
}
91459145
],
@@ -9183,13 +9183,13 @@
91839183
},
91849184
"license": "MIT"
91859185
},
9186-
"tracing 0.1.32": {
9186+
"tracing 0.1.33": {
91879187
"name": "tracing",
9188-
"version": "0.1.32",
9188+
"version": "0.1.33",
91899189
"repository": {
91909190
"Http": {
9191-
"url": "https://crates.io/api/v1/crates/tracing/0.1.32/download",
9192-
"sha256": "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
9191+
"url": "https://crates.io/api/v1/crates/tracing/0.1.33/download",
9192+
"sha256": "80b9fa4360528139bc96100c160b7ae879f5567f49f1782b0b02035b0358ebf3"
91939193
}
91949194
},
91959195
"targets": [
@@ -9249,7 +9249,7 @@
92499249
],
92509250
"selects": {}
92519251
},
9252-
"version": "0.1.32"
9252+
"version": "0.1.33"
92539253
},
92549254
"license": "MIT"
92559255
},
@@ -9389,7 +9389,7 @@
93899389
"target": "pin_project"
93909390
},
93919391
{
9392-
"id": "tracing 0.1.32",
9392+
"id": "tracing 0.1.33",
93939393
"target": "tracing"
93949394
}
93959395
],

‎examples/crate_universe/no_cargo_manifests/Cargo.Bazel.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "3a7b41c8aa6d72b38ee436a36986bd86ead405ee1453bf34239ef7396bbf44e1",
2+
"checksum": "e363b114bfca318daf2672f5264190592878fe5d1826d721ea18d1508bbd578d",
33
"crates": {
44
"ansi_term 0.12.1": {
55
"name": "ansi_term",
@@ -515,11 +515,11 @@
515515
"target": "tower_http"
516516
},
517517
{
518-
"id": "tracing 0.1.32",
518+
"id": "tracing 0.1.33",
519519
"target": "tracing"
520520
},
521521
{
522-
"id": "tracing-subscriber 0.3.10",
522+
"id": "tracing-subscriber 0.3.11",
523523
"target": "tracing_subscriber"
524524
}
525525
],
@@ -994,7 +994,7 @@
994994
"target": "tokio_util"
995995
},
996996
{
997-
"id": "tracing 0.1.32",
997+
"id": "tracing 0.1.33",
998998
"target": "tracing"
999999
}
10001000
],
@@ -1415,7 +1415,7 @@
14151415
"target": "tower_service"
14161416
},
14171417
{
1418-
"id": "tracing 0.1.32",
1418+
"id": "tracing 0.1.33",
14191419
"target": "tracing"
14201420
},
14211421
{
@@ -3548,7 +3548,7 @@
35483548
"target": "tokio"
35493549
},
35503550
{
3551-
"id": "tracing 0.1.32",
3551+
"id": "tracing 0.1.33",
35523552
"target": "tracing"
35533553
}
35543554
],
@@ -3637,7 +3637,7 @@
36373637
"target": "tower_service"
36383638
},
36393639
{
3640-
"id": "tracing 0.1.32",
3640+
"id": "tracing 0.1.33",
36413641
"target": "tracing"
36423642
}
36433643
],
@@ -3731,7 +3731,7 @@
37313731
"target": "tower_service"
37323732
},
37333733
{
3734-
"id": "tracing 0.1.32",
3734+
"id": "tracing 0.1.33",
37353735
"target": "tracing"
37363736
}
37373737
],
@@ -3808,13 +3808,13 @@
38083808
},
38093809
"license": "MIT"
38103810
},
3811-
"tracing 0.1.32": {
3811+
"tracing 0.1.33": {
38123812
"name": "tracing",
3813-
"version": "0.1.32",
3813+
"version": "0.1.33",
38143814
"repository": {
38153815
"Http": {
3816-
"url": "https://crates.io/api/v1/crates/tracing/0.1.32/download",
3817-
"sha256": "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
3816+
"url": "https://crates.io/api/v1/crates/tracing/0.1.33/download",
3817+
"sha256": "80b9fa4360528139bc96100c160b7ae879f5567f49f1782b0b02035b0358ebf3"
38183818
}
38193819
},
38203820
"targets": [
@@ -3874,7 +3874,7 @@
38743874
],
38753875
"selects": {}
38763876
},
3877-
"version": "0.1.32"
3877+
"version": "0.1.33"
38783878
},
38793879
"license": "MIT"
38803880
},
@@ -4037,13 +4037,13 @@
40374037
},
40384038
"license": "MIT"
40394039
},
4040-
"tracing-subscriber 0.3.10": {
4040+
"tracing-subscriber 0.3.11": {
40414041
"name": "tracing-subscriber",
4042-
"version": "0.3.10",
4042+
"version": "0.3.11",
40434043
"repository": {
40444044
"Http": {
4045-
"url": "https://crates.io/api/v1/crates/tracing-subscriber/0.3.10/download",
4046-
"sha256": "b9df98b037d039d03400d9dd06b0f8ce05486b5f25e9a2d7d36196e142ebbc52"
4045+
"url": "https://crates.io/api/v1/crates/tracing-subscriber/0.3.11/download",
4046+
"sha256": "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
40474047
}
40484048
},
40494049
"targets": [
@@ -4108,7 +4108,7 @@
41084108
"selects": {}
41094109
},
41104110
"edition": "2018",
4111-
"version": "0.3.10"
4111+
"version": "0.3.11"
41124112
},
41134113
"license": "MIT"
41144114
},

0 commit comments

Comments
 (0)