diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-02-11 14:16:05 +0100 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-02-12 10:15:28 +0100 |
| commit | f55ec2043a07f625c87fad4368bb252e09162863 (patch) | |
| tree | adcbcf2decf1af44bb1025f86e3a46570857c383 | |
| parent | b083dbefa0676d4e67ad890667943995a3d7e4c4 (diff) | |
| download | mullvadvpn-f55ec2043a07f625c87fad4368bb252e09162863.tar.xz mullvadvpn-f55ec2043a07f625c87fad4368bb252e09162863.zip | |
Revert edition change in `Cargo.toml`
| -rw-r--r-- | Cargo.toml | 4 | ||||
| -rw-r--r-- | rust-toolchain.toml | 3 | ||||
| -rw-r--r-- | rustfmt.toml | 2 | ||||
| -rw-r--r-- | test/Cargo.toml | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/Cargo.toml b/Cargo.toml index b001dd3292..2555ad16d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,9 +2,9 @@ authors = ["Mullvad VPN"] repository = "https://github.com/mullvad/mullvadvpn-app/" license = "GPL-3.0" -edition = "2024" +edition = "2021" # Must be less than or equal to `channel` in `rust-toolchain.toml` -rust-version = "1.85.0" +rust-version = "1.83.0" [workspace] resolver = "2" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6b4110675e..efba5d8d0f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,3 @@ [toolchain] # Must be greater than or equal to `rust-version` in `Cargo.toml` -# TODO: temporarily be set to beta for rust-analyzer to behave as if `--beta` was passed -channel = "beta" +channel = "1.83.0" diff --git a/rustfmt.toml b/rustfmt.toml index 6a2a146801..0bb88037be 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,4 +1,4 @@ -edition = "2024" +edition = "2021" # Activation of features, almost objectively better ;) use_try_shorthand = true diff --git a/test/Cargo.toml b/test/Cargo.toml index 59844845ac..c5f216217f 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -2,8 +2,8 @@ authors = ["Mullvad VPN"] repository = "https://github.com/mullvad/mullvadvpn-app/" license = "GPL-3.0" -edition = "2024" -rust-version = "1.85.0" +edition = "2021" +rust-version = "1.83.0" [workspace] resolver = "2" |