Skip to content

Commit

Permalink
Update Rust to 1.79 (#310)
Browse files Browse the repository at this point in the history
  • Loading branch information
maxammann authored Jul 23, 2024
1 parent 151ee9f commit 784604e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ description = "Maps for Desktop, Mobile and Web"
version = "0.1.0"
edition = "2021"
# Keep this in sync with `rust-toolchain.toml` and `justfile`
rust-version = "1.76"
rust-version = "1.79"
license = "MIT OR Apache-2.0"
keywords = ["graphics", "maps", "webgl", "tiles"]
categories = ["graphics", "science::geo"]
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ cargo {
targetDirectory = "${module}/../target"
profile = "debug"
// This should be in sync with the justfile
rustupChannel = "nightly-2024-03-12"
rustupChannel = "nightly-2024-07-22"


features {
Expand Down
4 changes: 2 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ set shell := ["bash", "-c"]

# Keep this in sync with `android/gradle/lib/build.gradle`

export NIGHTLY_TOOLCHAIN := "nightly-2024-03-12"
export NIGHTLY_TOOLCHAIN := "nightly-2024-07-22"

# Keep this in sync with `rust-toolchain.toml` and `Cargo.toml`.
# Make sure the above is newer than this.

export STABLE_TOOLCHAIN := "1.76"
export STABLE_TOOLCHAIN := "1.79"
export CARGO_TERM_COLOR := "always"
export RUST_BACKTRACE := "1"

Expand Down
4 changes: 2 additions & 2 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[toolchain]
# The CI will not use the rust-toolchain.toml file to build this project.
# The CI might use it though to build other Rust binaries, required for building maplibre-rs.
# However, the CI might use it to build other Rust binaries, required for building maplibre-rs.
# This file is here to give IDEs a hint about which Rust version to use.
# The version is set here instead of using stable, so we can make sure that a predictable version is used.
#
# Keep this in sync with `justfile` and `Cargo.toml`
channel = "1.76"
channel = "1.79"

0 comments on commit 784604e

Please sign in to comment.