Skip to content

Commit 9ff3f69

Browse files
authored
update to rust edition 2024 (#416)
1 parent fa52e3a commit 9ff3f69

31 files changed

Lines changed: 1107 additions & 988 deletions

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rust-argon2 = { version = "3.0", default-features = false }
2121
name = "devolutions-crypto"
2222
version.workspace = true
2323
authors = ["Mathieu Morrissette <mmorrissette@devolutions.net>", "Sebastien Duquette <sduquette@devolutions.net>"]
24-
edition = "2021"
24+
edition = "2024"
2525
readme = "README_RUST.md"
2626
license = "MIT OR Apache-2.0"
2727
homepage = "https://github.com/Devolutions/devolutions-crypto"

‎cli/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "devolutions-crypto-cli"
33
version.workspace = true
44
authors = ["Devolutions <network@devolutions.net>"]
5-
edition = "2018"
5+
edition = "2024"
66

77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

‎cli/src/main.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clap::{Parser, Subcommand};
2-
use devolutions_crypto::utils::{base64_decode, base64_encode};
32
use devolutions_crypto::DEFAULT_PBKDF2_ITERATIONS;
3+
use devolutions_crypto::utils::{base64_decode, base64_encode};
44
use std::{borrow::Borrow, convert::TryFrom};
55

66
/// Gives a CLI interface to Devolutions Crypto Library
@@ -236,7 +236,7 @@ fn main() {
236236
}
237237

238238
fn generate_key() {
239-
use devolutions_crypto::key::{generate_secret_key, KeyVersion};
239+
use devolutions_crypto::key::{KeyVersion, generate_secret_key};
240240

241241
let key: Vec<u8> = generate_secret_key(KeyVersion::Latest).into();
242242
println!("{}", base64_encode(&key));

‎ffi/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "devolutions-crypto-ffi"
33
version.workspace = true
4-
edition = "2021"
4+
edition = "2024"
55

66
[lib]
77
name = "devolutions_crypto_ffi"

0 commit comments

Comments
 (0)