Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Rust 1.62.0 #1427

Merged
merged 5 commits into from
Jul 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions cargo/cargo_build_script_runner/bin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ fn run_buildrs() -> Result<(), String> {
if line.is_empty() {
continue;
}
let mut key_val = line.splitn(2, '=');
match (key_val.next(), key_val.next()) {
(Some(key), Some(value)) => {
match line.split_once('=') {
Some((key, value)) => {
command.env(key, value.replace("${pwd}", &exec_root.to_string_lossy()));
}
_ => {
Expand Down Expand Up @@ -255,10 +254,8 @@ fn parse_rustc_cfg_output(stdout: &str) -> BTreeMap<String, String> {

for line in stdout.lines() {
if line.starts_with("target_") && line.contains('=') {
let mut parts = line.splitn(2, '=');
// UNWRAP: Verified that line contains = and split into exactly 2 parts.
let key = parts.next().unwrap();
let value = parts.next().unwrap();
let (key, value) = line.split_once('=').unwrap();
if value.starts_with('"') && value.ends_with('"') && value.len() >= 2 {
values
.entry(key)
Expand Down
24 changes: 12 additions & 12 deletions crate_universe/3rdparty/Cargo.Bazel.lock
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,9 @@ dependencies = [

[[package]]
name = "crypto-common"
version = "0.1.3"
version = "0.1.4"
source = "registry+https:/rust-lang/crates.io-index"
checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
checksum = "5999502d32b9c48d492abe66392408144895020ec4709e549e840799f3bb74c0"
dependencies = [
"generic-array 0.14.5 (registry+https:/rust-lang/crates.io-index)",
"typenum",
Expand Down Expand Up @@ -724,9 +724,9 @@ dependencies = [

[[package]]
name = "once_cell"
version = "1.12.0"
version = "1.12.1"
source = "registry+https:/rust-lang/crates.io-index"
checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
checksum = "ac8b1a9b2518dc799a2271eff1688707eb315f0d4697aa6b0871369ca4c4da55"

[[package]]
name = "opaque-debug"
Expand Down Expand Up @@ -1028,27 +1028,27 @@ dependencies = [

[[package]]
name = "semver"
version = "1.0.11"
version = "1.0.12"
source = "registry+https:/rust-lang/crates.io-index"
checksum = "3d92beeab217753479be2f74e54187a6aed4c125ff0703a866c3147a02f0c6dd"
checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
dependencies = [
"serde",
]

[[package]]
name = "serde"
version = "1.0.137"
version = "1.0.138"
source = "registry+https:/rust-lang/crates.io-index"
checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47"
dependencies = [
"serde_derive",
]

[[package]]
name = "serde_derive"
version = "1.0.137"
version = "1.0.138"
source = "registry+https:/rust-lang/crates.io-index"
checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c"
dependencies = [
"proc-macro2",
"quote",
Expand Down Expand Up @@ -1343,9 +1343,9 @@ dependencies = [

[[package]]
name = "unicode-normalization"
version = "0.1.20"
version = "0.1.21"
source = "registry+https:/rust-lang/crates.io-index"
checksum = "81dee68f85cab8cf68dec42158baf3a79a1cdc065a8b103025965d6ccb7f6cbd"
checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
dependencies = [
"tinyvec",
]
Expand Down
4 changes: 2 additions & 2 deletions crate_universe/3rdparty/crates/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ alias(

alias(
name = "semver",
actual = "@crate_universe_crate_index__semver-1.0.11//:semver",
actual = "@crate_universe_crate_index__semver-1.0.12//:semver",
tags = ["manual"],
)

alias(
name = "serde",
actual = "@crate_universe_crate_index__serde-1.0.137//:serde",
actual = "@crate_universe_crate_index__serde-1.0.138//:serde",
tags = ["manual"],
)

Expand Down
2 changes: 1 addition & 1 deletion crate_universe/3rdparty/crates/BUILD.camino-1.0.9.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ rust_library(
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__camino-1.0.9//:build_script_build",
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__serde-1.0.138//:serde",
],
}),
)
Expand Down
8 changes: 4 additions & 4 deletions crate_universe/3rdparty/crates/BUILD.cargo-lock-8.0.2.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ rust_library(
deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__semver-1.0.11//:semver",
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__semver-1.0.12//:semver",
"@crate_universe_crate_index__serde-1.0.138//:serde",
"@crate_universe_crate_index__toml-0.5.9//:toml",
"@crate_universe_crate_index__url-2.2.2//:url",
],
Expand Down Expand Up @@ -139,8 +139,8 @@ rust_binary(
":cargo_lock",
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__semver-1.0.11//:semver",
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__semver-1.0.12//:semver",
"@crate_universe_crate_index__serde-1.0.138//:serde",
"@crate_universe_crate_index__toml-0.5.9//:toml",
"@crate_universe_crate_index__url-2.2.2//:url",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ rust_library(
deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__serde-1.0.138//:serde",
],
}),
)
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ rust_library(
"//conditions:default": [
"@crate_universe_crate_index__camino-1.0.9//:camino",
"@crate_universe_crate_index__cargo-platform-0.1.2//:cargo_platform",
"@crate_universe_crate_index__semver-1.0.11//:semver",
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__semver-1.0.12//:semver",
"@crate_universe_crate_index__serde-1.0.138//:serde",
"@crate_universe_crate_index__serde_json-1.0.82//:serde_json",
],
}),
Expand Down
4 changes: 2 additions & 2 deletions crate_universe/3rdparty/crates/BUILD.cargo_toml-0.11.5.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ rust_library(
proc_macro_deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__serde_derive-1.0.137//:serde_derive",
"@crate_universe_crate_index__serde_derive-1.0.138//:serde_derive",
],
}),
rustc_env = {
Expand All @@ -77,7 +77,7 @@ rust_library(
deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__serde-1.0.138//:serde",
"@crate_universe_crate_index__toml-0.5.9//:toml",
],
}),
Expand Down
4 changes: 2 additions & 2 deletions crate_universe/3rdparty/crates/BUILD.clap-3.2.8.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ rust_library(
"@crate_universe_crate_index__bitflags-1.3.2//:bitflags",
"@crate_universe_crate_index__clap_lex-0.2.4//:clap_lex",
"@crate_universe_crate_index__indexmap-1.9.1//:indexmap",
"@crate_universe_crate_index__once_cell-1.12.0//:once_cell",
"@crate_universe_crate_index__once_cell-1.12.1//:once_cell",
"@crate_universe_crate_index__strsim-0.10.0//:strsim",
"@crate_universe_crate_index__termcolor-1.1.3//:termcolor",
"@crate_universe_crate_index__textwrap-0.15.0//:textwrap",
Expand Down Expand Up @@ -171,7 +171,7 @@ rust_binary(
"@crate_universe_crate_index__bitflags-1.3.2//:bitflags",
"@crate_universe_crate_index__clap_lex-0.2.4//:clap_lex",
"@crate_universe_crate_index__indexmap-1.9.1//:indexmap",
"@crate_universe_crate_index__once_cell-1.12.0//:once_cell",
"@crate_universe_crate_index__once_cell-1.12.1//:once_cell",
"@crate_universe_crate_index__strsim-0.10.0//:strsim",
"@crate_universe_crate_index__termcolor-1.1.3//:termcolor",
"@crate_universe_crate_index__textwrap-0.15.0//:textwrap",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ rust_library(
proc_macro_deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__serde_derive-1.0.137//:serde_derive",
"@crate_universe_crate_index__serde_derive-1.0.138//:serde_derive",
],
}),
rustc_env = {
Expand Down Expand Up @@ -83,8 +83,8 @@ rust_library(
"@crate_universe_crate_index__memchr-2.5.0//:memchr",
"@crate_universe_crate_index__num_cpus-1.13.1//:num_cpus",
"@crate_universe_crate_index__rustc-hash-1.1.0//:rustc_hash",
"@crate_universe_crate_index__semver-1.0.11//:semver",
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__semver-1.0.12//:semver",
"@crate_universe_crate_index__serde-1.0.138//:serde",
"@crate_universe_crate_index__serde_json-1.0.82//:serde_json",
"@crate_universe_crate_index__smartstring-1.0.1//:smartstring",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ rust_library(
"//conditions:default": [
"@crate_universe_crate_index__cfg-if-1.0.0//:cfg_if",
"@crate_universe_crate_index__crossbeam-utils-0.8.10//:build_script_build",
"@crate_universe_crate_index__once_cell-1.12.0//:once_cell",
"@crate_universe_crate_index__once_cell-1.12.1//:once_cell",
],
}),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "0.1.3",
version = "0.1.4",
deps = [
] + select_with_or({
"//conditions:default": [
Expand Down
2 changes: 1 addition & 1 deletion crate_universe/3rdparty/crates/BUILD.digest-0.10.3.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ rust_library(
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__block-buffer-0.10.2//:block_buffer",
"@crate_universe_crate_index__crypto-common-0.1.3//:crypto_common",
"@crate_universe_crate_index__crypto-common-0.1.4//:crypto_common",
],
}),
)
2 changes: 1 addition & 1 deletion crate_universe/3rdparty/crates/BUILD.hex-0.4.3.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ rust_library(
deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__serde-1.0.138//:serde",
],
}),
)
2 changes: 1 addition & 1 deletion crate_universe/3rdparty/crates/BUILD.idna-0.2.3.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ rust_library(
"//conditions:default": [
"@crate_universe_crate_index__matches-0.1.9//:matches",
"@crate_universe_crate_index__unicode-bidi-0.3.8//:unicode_bidi",
"@crate_universe_crate_index__unicode-normalization-0.1.20//:unicode_normalization",
"@crate_universe_crate_index__unicode-normalization-0.1.21//:unicode_normalization",
],
}),
)
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "1.12.0",
version = "1.12.1",
deps = [
] + select_with_or({
"//conditions:default": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "1.0.11",
version = "1.0.12",
deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__semver-1.0.11//:build_script_build",
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__semver-1.0.12//:build_script_build",
"@crate_universe_crate_index__serde-1.0.138//:serde",
],
}),
)
Expand Down Expand Up @@ -149,7 +149,7 @@ cargo_build_script(
"//conditions:default": [
],
}),
version = "1.0.11",
version = "1.0.12",
visibility = ["//visibility:private"],
deps = [
] + select_with_or({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ rust_library(
proc_macro_deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__serde_derive-1.0.137//:serde_derive",
"@crate_universe_crate_index__serde_derive-1.0.138//:serde_derive",
],
}),
rustc_env = {
Expand All @@ -82,11 +82,11 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "1.0.137",
version = "1.0.138",
deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__serde-1.0.137//:build_script_build",
"@crate_universe_crate_index__serde-1.0.138//:build_script_build",
],
}),
)
Expand Down Expand Up @@ -153,7 +153,7 @@ cargo_build_script(
"//conditions:default": [
],
}),
version = "1.0.137",
version = "1.0.138",
visibility = ["//visibility:private"],
deps = [
] + select_with_or({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ rust_proc_macro(
"noclippy",
"norustfmt",
],
version = "1.0.137",
version = "1.0.138",
deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__proc-macro2-1.0.40//:proc_macro2",
"@crate_universe_crate_index__quote-1.0.20//:quote",
"@crate_universe_crate_index__serde_derive-1.0.137//:build_script_build",
"@crate_universe_crate_index__serde_derive-1.0.138//:build_script_build",
"@crate_universe_crate_index__syn-1.0.98//:syn",
],
}),
Expand Down Expand Up @@ -147,7 +147,7 @@ cargo_build_script(
"//conditions:default": [
],
}),
version = "1.0.137",
version = "1.0.138",
visibility = ["//visibility:private"],
deps = [
] + select_with_or({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ rust_library(
"//conditions:default": [
"@crate_universe_crate_index__itoa-1.0.2//:itoa",
"@crate_universe_crate_index__ryu-1.0.10//:ryu",
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__serde-1.0.138//:serde",
"@crate_universe_crate_index__serde_json-1.0.82//:build_script_build",
],
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ rust_library(
deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__serde-1.0.138//:serde",
"@crate_universe_crate_index__smartstring-1.0.1//:build_script_build",
"@crate_universe_crate_index__static_assertions-1.1.0//:static_assertions",
],
Expand Down
2 changes: 1 addition & 1 deletion crate_universe/3rdparty/crates/BUILD.tera-1.16.0.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ rust_library(
"@crate_universe_crate_index__pest-2.1.3//:pest",
"@crate_universe_crate_index__rand-0.8.5//:rand",
"@crate_universe_crate_index__regex-1.5.6//:regex",
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__serde-1.0.138//:serde",
"@crate_universe_crate_index__serde_json-1.0.82//:serde_json",
"@crate_universe_crate_index__slug-0.1.4//:slug",
"@crate_universe_crate_index__unic-segment-0.9.0//:unic_segment",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ rust_library(
deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__once_cell-1.12.0//:once_cell",
"@crate_universe_crate_index__once_cell-1.12.1//:once_cell",
],
}),
)
2 changes: 1 addition & 1 deletion crate_universe/3rdparty/crates/BUILD.toml-0.5.9.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ rust_library(
deps = [
] + select_with_or({
"//conditions:default": [
"@crate_universe_crate_index__serde-1.0.137//:serde",
"@crate_universe_crate_index__serde-1.0.138//:serde",
],
}),
)
Loading