Skip to content

Commit 4bd44d0

Browse files
UebelAndreUebelAndre
authored
Added Rust 1.71.0 (#2062)
https://blog.rust-lang.org/2023/07/13/Rust-1.71.0.html
1 parent e3cc007 commit 4bd44d0

File tree

53 files changed

+1539
-551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1539
-551
lines changed

‎.clang-format

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
---
22
BasedOnStyle: Google
3+
IndentWidth: 4
34
...

‎.github/workflows/formatting.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Formatting
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
types:
9+
- opened
10+
- synchronize
11+
12+
jobs:
13+
clang-format-checking:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- uses: DoozyX/[email protected]
18+
with:
19+
source: '.'
20+
extensions: 'h,c,cc,proto'
21+
clangFormatVersion: 14

‎crate_universe/src/context/platforms.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ pub fn resolve_cfg_platforms(
2121
attr.deps
2222
.configurations()
2323
.into_iter()
24-
.chain(attr.deps_dev.configurations().into_iter())
25-
.chain(attr.proc_macro_deps.configurations().into_iter())
26-
.chain(attr.proc_macro_deps_dev.configurations().into_iter())
24+
.chain(attr.deps_dev.configurations())
25+
.chain(attr.proc_macro_deps.configurations())
26+
.chain(attr.proc_macro_deps_dev.configurations())
2727
// Chain the build dependencies if some are defined
2828
.chain(if let Some(attr) = &ctx.build_script_attrs {
2929
attr.deps
3030
.configurations()
3131
.into_iter()
32-
.chain(attr.proc_macro_deps.configurations().into_iter())
32+
.chain(attr.proc_macro_deps.configurations())
3333
.collect::<BTreeSet<Option<&String>>>()
3434
.into_iter()
3535
} else {

‎crate_universe/src/splicing/cargo_config.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ mod test {
171171
let config = temp_dir.as_ref().join("config.toml");
172172

173173
fs::write(&config, textwrap::dedent(
174-
r##"
174+
r#"
175175
# Makes artifactory the default registry and saves passing --registry parameter
176176
[registry]
177177
default = "art-crates-remote"
@@ -185,7 +185,7 @@ mod test {
185185
186186
[net]
187187
git-fetch-with-cli = true
188-
"##,
188+
"#,
189189
)).unwrap();
190190

191191
let config = CargoConfig::try_from_path(&config).unwrap();
@@ -224,7 +224,7 @@ mod test {
224224
let config = temp_dir.as_ref().join("config.toml");
225225

226226
fs::write(&config, textwrap::dedent(
227-
r##"
227+
r#"
228228
[registries]
229229
art-crates-remote = { index = "https://artprod.mycompany/artifactory/git/cargo-remote.git" }
230230
@@ -233,7 +233,7 @@ mod test {
233233
234234
[source.some-mirror]
235235
registry = "https://artmirror.mycompany/artifactory/cargo-mirror.git"
236-
"##,
236+
"#,
237237
)).unwrap();
238238

239239
let config = CargoConfig::try_from_path(&config).unwrap();
@@ -249,13 +249,13 @@ mod test {
249249
let config = temp_dir.as_ref().join("config.toml");
250250

251251
fs::write(&config, textwrap::dedent(
252-
r##"
252+
r#"
253253
[registries]
254254
art-crates-remote = { index = "https://artprod.mycompany/artifactory/git/cargo-remote.git" }
255255
256256
[source.crates-io]
257257
replace-with = "art-crates-remote"
258-
"##,
258+
"#,
259259
)).unwrap();
260260

261261
let config = CargoConfig::try_from_path(&config).unwrap();
@@ -273,10 +273,10 @@ mod test {
273273
fs::write(
274274
&config,
275275
textwrap::dedent(
276-
r##"
276+
r#"
277277
[source.some-mirror]
278278
registry = "https://artmirror.mycompany/artifactory/cargo-mirror.git"
279-
"##,
279+
"#,
280280
),
281281
)
282282
.unwrap();
@@ -319,7 +319,7 @@ mod test {
319319
let config = temp_dir.as_ref().join("config.toml");
320320

321321
fs::write(&config, textwrap::dedent(
322-
r##"
322+
r#"
323323
[registries]
324324
art-crates-remote = { index = "https://artprod.mycompany/artifactory/git/cargo-remote.git" }
325325
@@ -328,7 +328,7 @@ mod test {
328328
329329
[source.some-mirror]
330330
registry = "https://artmirror.mycompany/artifactory/cargo-mirror.git"
331-
"##,
331+
"#,
332332
)).unwrap();
333333

334334
let config = CargoConfig::try_from_path(&config).unwrap();
@@ -360,7 +360,7 @@ mod test {
360360
let config = temp_dir.as_ref().join("config.toml");
361361

362362
fs::write(&config, textwrap::dedent(
363-
r##"
363+
r#"
364364
[registries]
365365
art-crates-remote = { index = "https://artprod.mycompany/artifactory/git/cargo-remote.git" }
366366
@@ -369,7 +369,7 @@ mod test {
369369
370370
[source.some-mirror]
371371
registry = "https://artmirror.mycompany/artifactory/cargo-mirror.git"
372-
"##,
372+
"#,
373373
)).unwrap();
374374

375375
let config = CargoConfig::try_from_path(&config).unwrap();

‎crate_universe/src/splicing/splicer.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ impl<'a> SplicerKind<'a> {
347347
fs::create_dir(&dot_cargo_dir)?;
348348
symlink_roots(&real_path, &dot_cargo_dir, Some(&["config", "config.toml"]))?;
349349
} else {
350-
for config in vec![
350+
for config in [
351351
dot_cargo_dir.join("config"),
352352
dot_cargo_dir.join("config.toml"),
353353
] {
@@ -364,7 +364,7 @@ impl<'a> SplicerKind<'a> {
364364
}
365365

366366
// Make sure no other config files exist
367-
for config in vec![
367+
for config in [
368368
workspace_dir.join("config"),
369369
workspace_dir.join("config.toml"),
370370
dot_cargo_dir.join("config"),
@@ -384,7 +384,7 @@ impl<'a> SplicerKind<'a> {
384384
let mut current_parent = workspace_dir.parent();
385385
while let Some(parent) = current_parent {
386386
let dot_cargo_dir = parent.join(".cargo");
387-
for config in vec![
387+
for config in [
388388
dot_cargo_dir.join("config.toml"),
389389
dot_cargo_dir.join("config"),
390390
] {

‎docs/cargo.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ A rule for bootstrapping a Rust binary using [Cargo](https://doc.rust-lang.org/c
3636
| <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'), <code>{channel}</code> (eg. 'stable'), and <code>{tool}</code> (eg. 'rustc.exe') will be replaced in the string if present. | String | optional | <code>"@rust_{system}_{arch}__{triple}__{channel}_tools//:bin/{tool}"</code> |
3737
| <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/concepts/labels">List of labels</a> | optional | <code>[]</code> |
3838
| <a id="cargo_bootstrap_repository-timeout"></a>timeout | Maximum duration of the Cargo build command in seconds | Integer | optional | <code>600</code> |
39-
| <a id="cargo_bootstrap_repository-version"></a>version | The version of cargo the resolver should use | String | optional | <code>"1.70.0"</code> |
39+
| <a id="cargo_bootstrap_repository-version"></a>version | The version of cargo the resolver should use | String | optional | <code>"1.71.0"</code> |
4040

4141

4242
<a id="cargo_dep_env"></a>

‎docs/crate_universe.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ CARGO_BAZEL_REPIN=1 CARGO_BAZEL_REPIN_ONLY=crate_index bazel sync --only=crate_i
386386
| <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/rules/lib/dict">Dictionary: String -> String</a> | required | |
387387
| <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'), <code>{channel}</code> (eg. 'stable'), and <code>{tool}</code> (eg. 'rustc.exe') will be replaced in the string if present. | String | optional | <code>"@rust_{system}_{arch}__{triple}__{channel}_tools//:bin/{tool}"</code> |
388388
| <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'), <code>{channel}</code> (eg. 'stable'), and <code>{tool}</code> (eg. 'cargo.exe') will be replaced in the string if present. | String | optional | <code>"@rust_{system}_{arch}__{triple}__{channel}_tools//:bin/{tool}"</code> |
389-
| <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 | <code>"1.70.0"</code> |
389+
| <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 | <code>"1.71.0"</code> |
390390
| <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 | <code>""</code> |
391391
| <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 | <code>["aarch64-unknown-linux-gnu", "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-sim", "aarch64-apple-ios", "aarch64-fuchsia", "aarch64-linux-android", "aarch64-pc-windows-msvc", "arm-unknown-linux-gnueabi", "armv7-linux-androideabi", "armv7-unknown-linux-gnueabi", "i686-linux-android", "i686-unknown-freebsd", "powerpc-unknown-linux-gnu", "riscv32imc-unknown-none-elf", "riscv64gc-unknown-none-elf", "s390x-unknown-linux-gnu", "thumbv7em-none-eabi", "thumbv8m.main-none-eabi", "wasm32-unknown-unknown", "wasm32-wasi", "x86_64-apple-ios", "x86_64-fuchsia", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-none"]</code> |
392392

@@ -725,7 +725,7 @@ Define dependencies of the `cargo-bazel` Rust target
725725

726726
| Name | Description | Default Value |
727727
| :------------- | :------------- | :------------- |
728-
| <a id="crate_universe_dependencies-rust_version"></a>rust_version | The version of rust to use when generating dependencies. | `"1.70.0"` |
728+
| <a id="crate_universe_dependencies-rust_version"></a>rust_version | The version of rust to use when generating dependencies. | `"1.71.0"` |
729729
| <a id="crate_universe_dependencies-bootstrap"></a>bootstrap | If true, a <code>cargo_bootstrap_repository</code> target will be generated. | `False` |
730730

731731

‎docs/flatten.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ A rule for bootstrapping a Rust binary using [Cargo](https://doc.rust-lang.org/c
109109
| <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'), <code>{channel}</code> (eg. 'stable'), and <code>{tool}</code> (eg. 'rustc.exe') will be replaced in the string if present. | String | optional | <code>"@rust_{system}_{arch}__{triple}__{channel}_tools//:bin/{tool}"</code> |
110110
| <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/concepts/labels">List of labels</a> | optional | <code>[]</code> |
111111
| <a id="cargo_bootstrap_repository-timeout"></a>timeout | Maximum duration of the Cargo build command in seconds | Integer | optional | <code>600</code> |
112-
| <a id="cargo_bootstrap_repository-version"></a>version | The version of cargo the resolver should use | String | optional | <code>"1.70.0"</code> |
112+
| <a id="cargo_bootstrap_repository-version"></a>version | The version of cargo the resolver should use | String | optional | <code>"1.71.0"</code> |
113113

114114

115115
<a id="cargo_dep_env"></a>
@@ -1899,7 +1899,7 @@ See `load_arbitrary_tool` in `@rules_rust//rust:repositories.bzl` for more detai
18991899
| <a id="rust_register_toolchains-global_allocator_library"></a>global_allocator_library | Target that provides allocator functions when global allocator is used with cc_common.link. | `None` |
19001900
| <a id="rust_register_toolchains-iso_date"></a>iso_date | **Deprecated**: Use <code>versions</code> instead. | `None` |
19011901
| <a id="rust_register_toolchains-register_toolchains"></a>register_toolchains | If true, repositories will be generated to produce and register <code>rust_toolchain</code> targets. | `True` |
1902-
| <a id="rust_register_toolchains-rustfmt_version"></a>rustfmt_version | The version of rustfmt. | `"nightly/2023-06-01"` |
1902+
| <a id="rust_register_toolchains-rustfmt_version"></a>rustfmt_version | The version of rustfmt. | `"nightly/2023-07-13"` |
19031903
| <a id="rust_register_toolchains-rust_analyzer_version"></a>rust_analyzer_version | The version of Rustc to pair with rust-analyzer. | `None` |
19041904
| <a id="rust_register_toolchains-sha256s"></a>sha256s | A dict associating tool subdirectories to sha256 hashes. | `None` |
19051905
| <a id="rust_register_toolchains-extra_target_triples"></a>extra_target_triples | Additional rust-style targets that rust toolchains should support. | `["wasm32-unknown-unknown", "wasm32-wasi"]` |

‎docs/rust_repositories.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ See `load_arbitrary_tool` in `@rules_rust//rust:repositories.bzl` for more detai
267267
| <a id="rust_register_toolchains-global_allocator_library"></a>global_allocator_library | Target that provides allocator functions when global allocator is used with cc_common.link. | `None` |
268268
| <a id="rust_register_toolchains-iso_date"></a>iso_date | **Deprecated**: Use <code>versions</code> instead. | `None` |
269269
| <a id="rust_register_toolchains-register_toolchains"></a>register_toolchains | If true, repositories will be generated to produce and register <code>rust_toolchain</code> targets. | `True` |
270-
| <a id="rust_register_toolchains-rustfmt_version"></a>rustfmt_version | The version of rustfmt. | `"nightly/2023-06-01"` |
270+
| <a id="rust_register_toolchains-rustfmt_version"></a>rustfmt_version | The version of rustfmt. | `"nightly/2023-07-13"` |
271271
| <a id="rust_register_toolchains-rust_analyzer_version"></a>rust_analyzer_version | The version of Rustc to pair with rust-analyzer. | `None` |
272272
| <a id="rust_register_toolchains-sha256s"></a>sha256s | A dict associating tool subdirectories to sha256 hashes. | `None` |
273273
| <a id="rust_register_toolchains-extra_target_triples"></a>extra_target_triples | Additional rust-style targets that rust toolchains should support. | `["wasm32-unknown-unknown", "wasm32-wasi"]` |

‎examples/android/allocator_library.cc

+20-18
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,31 @@
2424
__attribute__((weak)) uint8_t __rust_alloc_error_handler_should_panic = 0;
2525

2626
extern "C" uint8_t *__rdl_alloc(uintptr_t size, uintptr_t align);
27-
extern "C" __attribute__((weak))
28-
uint8_t *__rust_alloc(uintptr_t size, uintptr_t align) {
29-
return __rdl_alloc(size, align);
27+
extern "C" __attribute__((weak)) uint8_t *__rust_alloc(uintptr_t size,
28+
uintptr_t align) {
29+
return __rdl_alloc(size, align);
3030
}
3131
extern "C" void __rdl_dealloc(uint8_t *ptr, uintptr_t size, uintptr_t align);
32-
extern "C" __attribute__((weak))
33-
void __rust_dealloc(uint8_t *ptr, uintptr_t size, uintptr_t align) {
34-
__rdl_dealloc(ptr, size, align);
32+
extern "C" __attribute__((weak)) void __rust_dealloc(uint8_t *ptr,
33+
uintptr_t size,
34+
uintptr_t align) {
35+
__rdl_dealloc(ptr, size, align);
3536
}
36-
extern "C" uint8_t *__rdl_realloc(uint8_t *ptr, uintptr_t old_size, uintptr_t align,
37-
uintptr_t new_size);
38-
extern "C" __attribute__((weak))
39-
uint8_t *__rust_realloc(uint8_t *ptr, uintptr_t old_size, uintptr_t align,
40-
uintptr_t new_size) {
41-
return __rdl_realloc(ptr, old_size, align, new_size);
37+
extern "C" uint8_t *__rdl_realloc(uint8_t *ptr, uintptr_t old_size,
38+
uintptr_t align, uintptr_t new_size);
39+
extern "C" __attribute__((weak)) uint8_t *__rust_realloc(uint8_t *ptr,
40+
uintptr_t old_size,
41+
uintptr_t align,
42+
uintptr_t new_size) {
43+
return __rdl_realloc(ptr, old_size, align, new_size);
4244
}
4345
extern "C" uint8_t *__rdl_alloc_zeroed(uintptr_t size, uintptr_t align);
44-
extern "C" __attribute__((weak))
45-
uint8_t *__rust_alloc_zeroed(uintptr_t size, uintptr_t align) {
46-
return __rdl_alloc_zeroed(size, align);
46+
extern "C" __attribute__((weak)) uint8_t *__rust_alloc_zeroed(uintptr_t size,
47+
uintptr_t align) {
48+
return __rdl_alloc_zeroed(size, align);
4749
}
4850
extern "C" void __rdl_oom(uintptr_t size, uintptr_t align);
49-
extern "C" __attribute__((weak))
50-
void __rust_alloc_error_handler(uintptr_t size, uintptr_t align) {
51-
__rdl_oom(size, align);
51+
extern "C" __attribute__((weak)) void __rust_alloc_error_handler(
52+
uintptr_t size, uintptr_t align) {
53+
__rdl_oom(size, align);
5254
}

‎examples/android/android_link_hack.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
// https://github.com/bazelbuild/rules_rust/issues/1271
22
extern void android_link_hack(void);
33

4-
void call_link_hack(void) {
5-
android_link_hack();
6-
}
4+
void call_link_hack(void) { android_link_hack(); }

‎examples/crate_universe/cargo_aliases/cargo-bazel-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/crate_universe/cargo_conditional_deps/cargo-bazel-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/crate_universe/cargo_workspace/cargo-bazel-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/crate_universe/multi_package/cargo-bazel-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/crate_universe/no_cargo_manifests/cargo-bazel-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ffi/c_calling_rust/main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
extern int32_t my_favorite_number();
55

66
int main(int argc, char** argv) {
7-
assert(my_favorite_number() == 4);
8-
return 0;
7+
assert(my_favorite_number() == 4);
8+
return 0;
99
}

0 commit comments

Comments
 (0)