Skip to content

Commit 4867d04

Browse files
committed
rust: update toolchain to 1.92
There is a breaking change about abort_immediate_panic, see CMakeLists.txt.
1 parent 647cec6 commit 4867d04

File tree

566 files changed

+165064
-33780
lines changed

Some content is hidden

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

566 files changed

+165064
-33780
lines changed

.containerversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
50
1+
51

Dockerfile

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
1-
# Copyright 2019 Shift Cryptosecurity AG
2-
# Copyright 2020 Shift Crypto AG
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
1+
# SPDX-License-Identifier: Apache-2.0
152

163
# If you are building for a foreign target and you get segfaults, try the latest version of qemu
174
# $ docker pull tonistiigi/binfmt:latest
@@ -148,8 +135,8 @@ RUN rustup target add thumbv7em-none-eabi
148135
RUN rustup component add rustfmt
149136
RUN rustup component add clippy
150137
RUN rustup component add rust-src
151-
RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.29.0 --locked
152-
RUN CARGO_HOME=/opt/cargo cargo install bindgen-cli --version 0.72.0 --locked
138+
RUN CARGO_HOME=/opt/cargo cargo install cbindgen --version 0.29.2 --locked
139+
RUN CARGO_HOME=/opt/cargo cargo install bindgen-cli --version 0.72.1 --locked
153140

154141
# Until cargo vendor supports vendoring dependencies of the rust std libs we
155142
# need a copy of this file next to the toml file. It also has to be world
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"files":{".cargo_vcs_info.json":"0d5846279da38304f12e79ced50c988ef4578326c26045753c1248c058a7767a",".github/workflows/main.yaml":"a73e5038724877f19b60a240e8a6abc269d522aca6621e008552735725435cd7",".github/workflows/publish.yaml":"b1a553c1bcddce79593567422d967cbf528ff30e5a70e411bb08e8c59bbcb452","CHANGELOG.md":"878bdeb4619b45b9589d8b7c955dac3bb27d7da3afd7c83b31521059311a88a9","Cargo.lock":"d39ce2834dcd3e925752aa75ec649c952f07d15fbfda33ff4c06f7f11aa30080","Cargo.toml":"7a831884be802f8b5e27a208a90ef810133e5c554d345c5405191ebbbd587f7e","Cargo.toml.orig":"fc8dbada5b4272d1a1f7187beda5f8597442405c64e848a4d9db9b6552df02a2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"29d3658afdb77671339563d483947e8ae1d6292648cb913868f86b86a2201642","src/lib.rs":"1ca4963f7793c0ba71dcca926330d214bfe216c5f3bcc9e1271d734eeb218641","src/tests/mod.rs":"35e67c0e474d6a7dd41363446f3b67af0716c71a5d8165eb7973a0cb129f5f7f","tests/smoke.rs":"26a95ac42e42b766ae752fe8531fb740fd147d5cdff352dec0763d175ce91806","triagebot.toml":"a135e10c777cd13459559bdf74fb704c1379af7c9b0f70bc49fa6f5a837daa81"},"package":"cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1"}
1+
{"files":{".cargo_vcs_info.json":"93db0145c8dc643f4ccbf2efdffe26435dc4b3886a6d6c70abdab053dfe1e141",".github/workflows/main.yaml":"020c589fac1607b498411fe10431ede8fe280d10a796602f3eab32a1d5f1f7d8",".github/workflows/publish.yaml":"b1a553c1bcddce79593567422d967cbf528ff30e5a70e411bb08e8c59bbcb452","CHANGELOG.md":"e9f336b5dcff576ed8ba48aed0c94c3a573756905cc93815ee08ba5b76ab5d38","Cargo.lock":"d53db1ee767b815f28463ae70ce0de3bce6e4e57f0f47bd1d01c9a89ada255c4","Cargo.toml":"819c8d7b776a6e79b08f87eef61cb1dd8b21bd6e65d56a312c5881abfd0df3dc","Cargo.toml.orig":"1915fa8aa7e1680e11fe5b239b22a456055c6d144fa88683442b123b1caaf11b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"29d3658afdb77671339563d483947e8ae1d6292648cb913868f86b86a2201642","src/lib.rs":"0efe982ce0fbbecc555f5376388d932fe0e60deeb3c74b3174ec38802c27b8d6","src/tests/mod.rs":"97bf60d030e13d8813944b170424f8badc3554bded1560783ea4bb3f5335a684","tests/smoke.rs":"26a95ac42e42b766ae752fe8531fb740fd147d5cdff352dec0763d175ce91806","triagebot.toml":"a135e10c777cd13459559bdf74fb704c1379af7c9b0f70bc49fa6f5a837daa81"},"package":"cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"git": {
3-
"sha1": "57b183a98599261ab535401b64aa0a46ab0b6a44"
3+
"sha1": "40846923f0ce024bcf8d3e9100cab64a38c8dd08"
44
},
55
"path_in_vcs": ""
66
}

external/vendor/getopts/.github/workflows/main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
with:
2525
key: ${{ matrix.target }}
2626
- run: cargo test
27+
- run: cargo test --no-default-features
2728

2829
doc_fmt:
2930
name: Document and check formatting

external/vendor/getopts/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.2.24](https://github.com/rust-lang/getopts/compare/v0.2.23...v0.2.24) - 2025-08-29
11+
12+
### Other
13+
14+
- Make unicode-width an optional default dependency ([#133](https://github.com/rust-lang/getopts/pull/133))
15+
1016
## [0.2.23](https://github.com/rust-lang/getopts/compare/v0.2.22...v0.2.23) - 2025-06-09
1117

1218
### Other

external/vendor/getopts/Cargo.lock

Lines changed: 3 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external/vendor/getopts/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
edition = "2021"
1414
rust-version = "1.66"
1515
name = "getopts"
16-
version = "0.2.23"
16+
version = "0.2.24"
1717
authors = ["The Rust Project Developers"]
1818
build = false
1919
autolib = false
@@ -28,11 +28,12 @@ license = "MIT OR Apache-2.0"
2828
repository = "https://github.com/rust-lang/getopts"
2929

3030
[features]
31+
default = ["unicode"]
3132
rustc-dep-of-std = [
32-
"unicode-width/rustc-dep-of-std",
3333
"std",
3434
"core",
3535
]
36+
unicode = ["dep:unicode-width"]
3637

3738
[lib]
3839
name = "getopts"
@@ -54,6 +55,7 @@ package = "rustc-std-workspace-std"
5455

5556
[dependencies.unicode-width]
5657
version = "0.2.0"
58+
optional = true
5759

5860
[dev-dependencies.log]
5961
version = "0.4"

external/vendor/getopts/Cargo.toml.orig

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

external/vendor/getopts/src/lib.rs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@
104104
#[cfg(test)]
105105
#[macro_use]
106106
extern crate log;
107-
extern crate unicode_width;
108107

109108
use self::Fail::*;
110109
use self::HasArg::*;
@@ -119,8 +118,21 @@ use std::iter::{repeat, IntoIterator};
119118
use std::result;
120119
use std::str::FromStr;
121120

121+
#[cfg(feature = "unicode")]
122122
use unicode_width::UnicodeWidthStr;
123123

124+
#[cfg(not(feature = "unicode"))]
125+
trait UnicodeWidthStr {
126+
fn width(&self) -> usize;
127+
}
128+
129+
#[cfg(not(feature = "unicode"))]
130+
impl UnicodeWidthStr for str {
131+
fn width(&self) -> usize {
132+
self.len()
133+
}
134+
}
135+
124136
#[cfg(test)]
125137
mod tests;
126138

0 commit comments

Comments
 (0)