Rust 2024 edition (#339)

Author: giarc3

.github/workflows/ci.yaml

@@ -37,7 +37,7 @@ jobs:
             features: default
           # MSRV
           - os: ubuntu-22.04
-            toolchain: 1.81.0
+            toolchain: 1.85.0
             features: default
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -15,8 +15,8 @@ keywords = [
     "transform-encryption",
 ]
 description = "A pure-Rust SDK for accessing IronCore's privacy platform"
-edition = "2021"
-rust-version = "1.81.0"
+edition = "2024"
+rust-version = "1.85.0"
 
 [dependencies]
 base64 = "0.22"

benches/ironoxide_bench.rs

@@ -1,4 +1,4 @@
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use ironoxide::prelude::*;
 use lazy_static::*;
 use tokio::runtime::Runtime;
@@ -17,7 +17,9 @@ lazy_static! {
         },
         _ => {
             // The core code defaults to `prod`, so we have to set this so the API_URL is set correctly.
-            std::env::set_var("IRONCORE_ENV", "stage");
+            unsafe {
+                std::env::set_var("IRONCORE_ENV", "stage");
+            }
             "stage"
         },
     }

examples/enc-search-sample.rs

@@ -36,7 +36,7 @@
 // Copyright (c) 2020  IronCore Labs, Inc.
 // =============================================================================
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use ironoxide::prelude::*;
 use lazy_static::lazy_static;
 use mut_static::MutStatic;

flake.lock

@@ -1,4 +1,4 @@
 [toolchain]
 profile = "default"
-channel = "1.81.0"
+channel = "1.85.0"
 components = ["rust-src", "rust-analyzer"]

rust-toolchain.toml

@@ -3,7 +3,7 @@ use std::{fmt, num::NonZeroU32};
 use rand::{self, CryptoRng, RngCore};
 use ring::{aead, aead::BoundKey, digest, error::Unspecified, pbkdf2};
 
-use crate::internal::{take_lock, IronOxideErr};
+use crate::internal::{IronOxideErr, take_lock};
 use std::{convert::TryFrom, ops::DerefMut, sync::Mutex};
 
 //There is no way this can fail. Value is most definitely not less than one.

src/crypto/aes.rs

@@ -1,6 +1,6 @@
 use crate::internal::{
-    document_api::{DocAccessEditErr, UserOrGroup},
     IronOxideErr, PublicKey, WithKey,
+    document_api::{DocAccessEditErr, UserOrGroup},
 };
 use itertools::{Either, Itertools};
 use recrypt::{

src/crypto/transform.rs

@@ -8,12 +8,12 @@ pub use crate::internal::document_api::{
     DocumentMetadataResult, DocumentName, UserOrGroup, VisibleGroup, VisibleUser,
 };
 use crate::{
+    Result,
     common::SdkOperation,
     group::GroupId,
     internal::{add_optional_timeout, document_api},
     policy::PolicyGrant,
     user::UserId,
-    Result,
 };
 use futures::Future;
 use itertools::{Either, EitherOrBoth, Itertools};

src/document.rs

@@ -6,10 +6,10 @@ pub use crate::internal::document_api::{
     DocumentDecryptUnmanagedResult, DocumentEncryptUnmanagedResult,
 };
 use crate::{
-    document::{partition_user_or_group, DocumentEncryptOpts},
+    Result, SdkOperation,
+    document::{DocumentEncryptOpts, partition_user_or_group},
     internal,
     internal::add_optional_timeout,
-    Result, SdkOperation,
 };
 use futures::Future;
 use itertools::EitherOrBoth;