Skip to content

Commit

Permalink
Roll cxx: 1.0.126 => 1.0.128 in //third_party/rust.
Browse files Browse the repository at this point in the history
This CL has been created semi-automatically.  The expected review
process and other details can be found at
//tools/crates/create_update_cl.md

Updated crates:

* cxx: 1.0.126 => 1.0.128
* cxxbridge-flags: 1.0.126 => 1.0.128
* cxxbridge-macro: 1.0.126 => 1.0.128

Chromium `supply-chain/config.toml` policy requires that the following
audit criteria are met (note that these are the *minimum* required
criteria and `supply-chain/audits.toml` can and should record a stricter
certification if possible;  see also //docs/rust-unsafe.md):

* [email protected], [email protected], [email protected]:
  crypto-safe, safe-to-deploy, ub-risk-2

Bug: None
Change-Id: I50bab1e0cfd6d24b5a14bd04387f93ef4f6018f7
Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-rel
Disable-Rts: True
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5839554
Reviewed-by: Łukasz Anforowicz <[email protected]>
Commit-Queue: danakj <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1352261}
  • Loading branch information
danakj authored and Chromium LUCI CQ committed Sep 6, 2024
1 parent 3343b30 commit a9a4b44
Show file tree
Hide file tree
Showing 331 changed files with 248 additions and 204 deletions.
2 changes: 1 addition & 1 deletion build/rust/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if (toolchain_has_rust) {
# The version of cxx under //third_party/rust/chromium_crates_io/vendor.
# Update this whenever cxx is rolled. Also update the version number in the
# //third_party/rust/cxx/v1/cxx.h header.
cxx_version = "1.0.126"
cxx_version = "1.0.128"

# The required dependencies for cxx-generated bindings, that must be included
# on the C++ side.
Expand Down
10 changes: 5 additions & 5 deletions infra/inclusive_language_presubmit_exempt_dirs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -666,11 +666,11 @@ third_party/rust/chromium_crates_io/vendor/clap_builder-4.5.17/src/parser 1 1
third_party/rust/chromium_crates_io/vendor/codespan-reporting-0.11.1 2 1
third_party/rust/chromium_crates_io/vendor/codespan-reporting-0.11.1/examples 1 1
third_party/rust/chromium_crates_io/vendor/crc32fast-1.4.2/.github/workflows 2 1
third_party/rust/chromium_crates_io/vendor/cxx-1.0.126 1 1
third_party/rust/chromium_crates_io/vendor/cxx-1.0.126/book 1 1
third_party/rust/chromium_crates_io/vendor/cxx-1.0.126/book/src 3 1
third_party/rust/chromium_crates_io/vendor/cxx-1.0.126/.github/workflows 4 3
third_party/rust/chromium_crates_io/vendor/cxx-1.0.126/src 4 1
third_party/rust/chromium_crates_io/vendor/cxx-1.0.128 1 1
third_party/rust/chromium_crates_io/vendor/cxx-1.0.128/book 1 1
third_party/rust/chromium_crates_io/vendor/cxx-1.0.128/book/src 3 1
third_party/rust/chromium_crates_io/vendor/cxx-1.0.128/.github/workflows 4 3
third_party/rust/chromium_crates_io/vendor/cxx-1.0.128/src 4 1
third_party/rust/chromium_crates_io/vendor/either-1.13.0/.github/workflows 1 1
third_party/rust/chromium_crates_io/vendor/flate2-1.0.33 33 2
third_party/rust/chromium_crates_io/vendor/getrandom-0.2.15 5 1
Expand Down
6 changes: 3 additions & 3 deletions third_party/rust/chromium_crates_io/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions third_party/rust/chromium_crates_io/supply-chain/audits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,11 @@ criteria = ["safe-to-deploy", "does-not-implement-crypto", "ub-risk-0"]
delta = "1.0.124 -> 1.0.126"
notes = "No changes in this delta"

[[audits.cxxbridge-flags]]
who = "danakj <[email protected]>"
criteria = ["safe-to-deploy", "does-not-implement-crypto", "ub-risk-0"]
delta = "1.0.126 -> 1.0.128"

[[audits.cxxbridge-macro]]
who = "danakj <[email protected]>"
criteria = "does-not-implement-crypto"
Expand Down
16 changes: 9 additions & 7 deletions third_party/rust/chromium_crates_io/supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,16 @@ criteria = ["crypto-safe", "safe-to-run"]
[policy."crc32fast:1.4.2"]
criteria = ["crypto-safe", "safe-to-deploy", "ub-risk-2"]

[policy."cxx:1.0.126"]
[policy."cxx:1.0.128"]
criteria = ["crypto-safe", "safe-to-deploy", "ub-risk-2"]

[policy."cxxbridge-cmd:1.0.128"]
criteria = ["crypto-safe", "safe-to-run"]

[policy."cxxbridge-flags:1.0.126"]
[policy."cxxbridge-flags:1.0.128"]
criteria = ["crypto-safe", "safe-to-deploy", "ub-risk-2"]

[policy."cxxbridge-macro:1.0.126"]
[policy."cxxbridge-macro:1.0.128"]
criteria = ["crypto-safe", "safe-to-deploy", "ub-risk-2"]

[policy."either:1.13.0"]
Expand Down Expand Up @@ -336,8 +336,8 @@ criteria = ["crypto-safe", "safe-to-run"]
criteria = ["crypto-safe", "safe-to-run"]

[[exemptions.cxx]]
version = "1.0.126"
criteria = ["safe-to-deploy", "ub-risk-2"]
version = "1.0.128"
criteria = ["safe-to-deploy", "ub-risk-2", "crypto-safe"]
notes = """
Grandparented-in when setting up `cargo vet` in Jan 2024
Expand All @@ -350,11 +350,12 @@ Exemption updated to 1.0.122 in May 2024.
Exemption updated to 1.0.123 in June 2024.
Exemption updated to 1.0.124 in June 2024.
Exemption updated to 1.0.126 in August 2024.
Exemption updated to 1.0.128 in September 2024.
"""

[[exemptions.cxxbridge-macro]]
version = "1.0.126"
criteria = ["safe-to-deploy", "ub-risk-2"]
version = "1.0.128"
criteria = ["safe-to-deploy", "ub-risk-2", "crypto-safe"]
notes = """
Grandparented-in when setting up `cargo vet` in Jan 2024
Expand All @@ -367,6 +368,7 @@ Exemption updated to 1.0.122 in May 2024.
Exemption updated to 1.0.123 in June 2024.
Exemption updated to 1.0.124 in June 2024.
Exemption updated to 1.0.126 in August 2024.
Exemption updated to 1.0.128 in September 2024.
"""

[[exemptions.memchr]]
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"git": {
"sha1": "55bfb5444cd43bb594022a15c5ac61938edb380a"
},
"path_in_vcs": ""
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@ jobs:
name: ${{matrix.name || format('Rust {0}', matrix.rust)}}
needs: pre_ci
if: needs.pre_ci.outputs.continue
runs-on: ${{matrix.os || 'ubuntu'}}-latest
runs-on: ${{matrix.os}}-latest
strategy:
fail-fast: false
matrix:
rust: [nightly, beta, stable, 1.67.0, 1.70.0, 1.74.0]
os: [ubuntu]
include:
- rust: nightly
- rust: beta
- rust: stable
- rust: 1.67.0
- rust: 1.70.0
- rust: 1.74.0
- name: Cargo on macOS
rust: nightly
os: macos
Expand Down Expand Up @@ -59,7 +55,7 @@ jobs:
echo RUSTFLAGS=$RUSTFLAGS >> $GITHUB_ENV
echo exclude=--exclude cxx-test-suite ${{matrix.rust == '1.70.0' && '--exclude cxxbridge-cmd' || ''}} >> $GITHUB_OUTPUT
env:
RUSTFLAGS: ${{env.RUSTFLAGS}} ${{matrix.os && github.event_name != 'schedule' && '--cfg skip_ui_tests' || ''}}
RUSTFLAGS: ${{env.RUSTFLAGS}} ${{matrix.os != 'ubuntu' && github.event_name != 'schedule' && '--cfg skip_ui_tests' || ''}}
id: testsuite
shell: bash
- run: cargo run --manifest-path demo/Cargo.toml
Expand All @@ -71,6 +67,11 @@ jobs:
- run: cargo check --no-default-features
env:
RUSTFLAGS: --cfg compile_error_if_alloc --cfg cxx_experimental_no_alloc ${{env.RUSTFLAGS}}
- uses: actions/upload-artifact@v4
if: matrix.os == 'ubuntu' && matrix.rust == 'nightly' && always()
with:
name: Cargo.lock
path: Cargo.lock

reindeer:
name: Reindeer
Expand Down Expand Up @@ -145,6 +146,8 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name != 'pull_request'
timeout-minutes: 45
env:
RUSTFLAGS: -Dwarnings
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
edition = "2021"
rust-version = "1.67"
name = "cxx"
version = "1.0.126"
version = "1.0.128"
authors = ["David Tolnay <[email protected]>"]
build = "build.rs"
links = "cxxbridge1"
Expand Down Expand Up @@ -97,13 +97,13 @@ name = "unique_ptr"
path = "tests/unique_ptr.rs"

[dependencies.cxxbridge-macro]
version = "=1.0.126"
version = "=1.0.128"

[dependencies.link-cplusplus]
version = "1.0.9"

[dev-dependencies.cxx-build]
version = "=1.0.126"
version = "=1.0.128"

[dev-dependencies.cxx-gen]
version = "0.7"
Expand All @@ -122,7 +122,7 @@ features = ["diff"]
version = "1.0.83"

[build-dependencies.cxxbridge-flags]
version = "=1.0.126"
version = "=1.0.128"
default-features = false

[features]
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a9a4b44

Please sign in to comment.