Skip to content

Commit 7129d5a

Browse files
committed
bump msrv
1 parent 1b8cf50 commit 7129d5a

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

.changes/1038-1220-1482.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[
2+
{
3+
"description": "bump MSRV to 1.77.2",
4+
"type": "internal"
5+
}
6+
]

.changes/1038-1220.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- uses: ./.github/actions/setup-rust
7272
with:
7373
components: clippy
74-
toolchain: 1.64.0 # MSRV, Minimally Supported Rust Version. Make sure to update README.md and clippy.toml
74+
toolchain: 1.77.2 # MSRV, Minimally Supported Rust Version. Make sure to update README.md and clippy.toml
7575
- name: Run clippy
7676
run: cargo clippy --locked --all-targets --all-features --workspace -- -D warnings
7777
test:

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ include = [
1717
"README.md",
1818
"assets/*",
1919
]
20-
rust-version = "1.64"
20+
rust-version = "1.77.2"
2121

2222
[features]
2323
default = []

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ config snippet would look like this:
102102
[workspace.metadata.cross.target.aarch64-unknown-linux-gnu]
103103
# Install libssl-dev:arm64, see <https://github.com/cross-rs/cross/blob/main/docs/custom_images.md#adding-dependencies-to-existing-images>
104104
pre-build = [
105-
"dpkg --add-architecture $CROSS_DEB_ARCH",
105+
"dpkg --add-architecture $CROSS_DEB_ARCH",
106106
"apt-get update && apt-get --assume-yes install libssl-dev:$CROSS_DEB_ARCH"
107107
]
108108
[workspace.metadata.cross.target.armv7-unknown-linux-gnueabi]
@@ -125,7 +125,7 @@ it should search for the config file. This way you are not limited to a
125125
#### Option 4: Configuring `cross` through environment variables
126126

127127
Besides the TOML-based configuration files, config can be passed through
128-
[environment variables][docs_env_vars], too.
128+
[environment variables][docs_env_vars], too.
129129

130130

131131
### Docker in Docker
@@ -275,14 +275,14 @@ terminate.
275275

276276
[4] libc = newlib
277277

278-
[5] Must change
278+
[5] Must change
279279
`image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main-centos"` in
280280
`Cross.toml` for `[target.x86_64-unknown-linux-gnu]` to use the
281281
CentOS7-compatible target.
282282

283283
[6] libc = emscripten and GCC = clang
284284

285-
[7] Must change
285+
[7] Must change
286286
`image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main-centos"` in
287287
`Cross.toml` for `[target.aarch64-unknown-linux-gnu]` to use the
288288
CentOS7-compatible target.
@@ -318,7 +318,7 @@ $ QEMU_STRACE=1 cross run --target aarch64-unknown-linux-gnu
318318

319319
## Minimum Supported Rust Version (MSRV)
320320

321-
This crate is guaranteed to compile on stable Rust 1.64.0 and up. It *might*
321+
This crate is guaranteed to compile on stable Rust 1.77.2 and up. It *might*
322322
compile with older versions but that may change in any new patch release.
323323

324324
Some cross-compilation targets require a later Rust version, and using Xargo

clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ disallowed-methods = [
22
{ path = "std::path::Path::display", reason = "incorrect handling of non-Unicode paths, use path.to_utf8() or debug (`{path:?}`) instead" },
33
]
44
allow-unwrap-in-tests = true
5-
msrv = "1.64.0"
5+
msrv = "1.77.2"

src/config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ mod tests {
763763
map.insert("CROSS_BUILD_ENV_VOLUMES", "VOLUME1 VOLUME2");
764764
let env = Environment::new(Some(map));
765765
let config = Config::new_with(Some(toml(TOML_BUILD_VOLUMES)?), env);
766-
let expected = vec![s!("VOLUME1"), s!("VOLUME2")];
766+
let expected = [s!("VOLUME1"), s!("VOLUME2")];
767767

768768
let result = config.env_volumes(&target()).unwrap().unwrap_or_default();
769769
dbg!(&result);
@@ -779,7 +779,7 @@ mod tests {
779779
let map = HashMap::new();
780780
let env = Environment::new(Some(map));
781781
let config = Config::new_with(Some(toml(TOML_BUILD_VOLUMES)?), env);
782-
let expected = vec![s!("VOLUME3"), s!("VOLUME4")];
782+
let expected = [s!("VOLUME3"), s!("VOLUME4")];
783783

784784
let result = config.env_volumes(&target()).unwrap().unwrap_or_default();
785785
dbg!(&result);

0 commit comments

Comments
 (0)