Skip to content

Commit

Permalink
bump msrv
Browse files Browse the repository at this point in the history
  • Loading branch information
Emilgardis committed Apr 30, 2024
1 parent 1b8cf50 commit 7129d5a
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
6 changes: 6 additions & 0 deletions .changes/1038-1220-1482.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"description": "bump MSRV to 1.77.2",
"type": "internal"
}
]
6 changes: 0 additions & 6 deletions .changes/1038-1220.json

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- uses: ./.github/actions/setup-rust
with:
components: clippy
toolchain: 1.64.0 # MSRV, Minimally Supported Rust Version. Make sure to update README.md and clippy.toml
toolchain: 1.77.2 # MSRV, Minimally Supported Rust Version. Make sure to update README.md and clippy.toml
- name: Run clippy
run: cargo clippy --locked --all-targets --all-features --workspace -- -D warnings
test:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include = [
"README.md",
"assets/*",
]
rust-version = "1.64"
rust-version = "1.77.2"

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

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


### Docker in Docker
Expand Down Expand Up @@ -275,14 +275,14 @@ terminate.

[4] libc = newlib

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

[6] libc = emscripten and GCC = clang

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

## Minimum Supported Rust Version (MSRV)

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

Some cross-compilation targets require a later Rust version, and using Xargo
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ disallowed-methods = [
{ path = "std::path::Path::display", reason = "incorrect handling of non-Unicode paths, use path.to_utf8() or debug (`{path:?}`) instead" },
]
allow-unwrap-in-tests = true
msrv = "1.64.0"
msrv = "1.77.2"
4 changes: 2 additions & 2 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ mod tests {
map.insert("CROSS_BUILD_ENV_VOLUMES", "VOLUME1 VOLUME2");
let env = Environment::new(Some(map));
let config = Config::new_with(Some(toml(TOML_BUILD_VOLUMES)?), env);
let expected = vec![s!("VOLUME1"), s!("VOLUME2")];
let expected = [s!("VOLUME1"), s!("VOLUME2")];

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

let result = config.env_volumes(&target()).unwrap().unwrap_or_default();
dbg!(&result);
Expand Down

0 comments on commit 7129d5a

Please sign in to comment.