Skip to content

Commit e2f8cdf

Browse files
Merge pull request #42 from CleverCloud/devel/fdubois/build/update-msrv-and-edition
build(rust): update msrv to 1.85.0 and edition to 2024
2 parents 8714863 + 84ad1ad commit e2f8cdf

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
rust:
12-
- 1.84.1
12+
- 1.85.0
1313
- stable
1414
- beta
1515
- nightly
@@ -31,7 +31,7 @@ jobs:
3131
fail-fast: true
3232
matrix:
3333
rust:
34-
- 1.84.1
34+
- 1.85.0
3535
- stable
3636
- beta
3737
- nightly

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
name = "oauth10a"
33
description = "A rust implementation of the oauth 1.0a protocol fully-async with logging, metrics and tracing facilities"
44
version = "2.0.0"
5-
edition = "2021"
6-
rust-version = "1.84.1"
5+
edition = "2024"
6+
rust-version = "1.85.0"
77
authors = ["Florentin Dubois <[email protected]>"]
88
license-file = "LICENSE"
99
readme = "README.md"
@@ -39,7 +39,7 @@ tracing = { version = "^0.1.41", optional = true }
3939
tracing-futures = { version = "^0.2.5", optional = true }
4040
url = { version = "^2.5.4", default-features = false, features = ["serde"], optional = true }
4141
urlencoding = { version = "^2.1.3", optional = true }
42-
uuid = { version = "^1.13.1", features = ["serde", "v4"], optional = true }
42+
uuid = { version = "^1.14.0", features = ["serde", "v4"], optional = true }
4343

4444
[features]
4545
default = ["client", "logging"]

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.84.1
1+
1.85.0

src/client/mod.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ use std::{
1515
use std::{sync::LazyLock, time::Instant};
1616

1717
use async_trait::async_trait;
18-
use base64::{engine::general_purpose::STANDARD as BASE64_ENGINE, Engine};
18+
use base64::{Engine, engine::general_purpose::STANDARD as BASE64_ENGINE};
1919
use bytes::Buf;
2020
use crypto_common::InvalidLength;
2121
use hmac::{Hmac, Mac};
2222
#[cfg(feature = "logging")]
23-
use log::{error, log_enabled, trace, Level};
23+
use log::{Level, error, log_enabled, trace};
2424
#[cfg(feature = "metrics")]
25-
use prometheus::{opts, register_counter_vec, CounterVec};
25+
use prometheus::{CounterVec, opts, register_counter_vec};
2626
use reqwest::{
27-
header::{self, HeaderValue},
2827
Method, StatusCode,
28+
header::{self, HeaderValue},
2929
};
30-
use serde::{de::DeserializeOwned, Deserialize, Serialize};
30+
use serde::{Deserialize, Serialize, de::DeserializeOwned};
3131
use sha2::Sha512;
3232
use uuid::Uuid;
3333

@@ -268,7 +268,9 @@ pub enum SignerError {
268268
UnixEpochTime(SystemTimeError),
269269
#[error("failed to parse signature parameter, {0}")]
270270
Parse(String),
271-
#[error("failed to create signer as credentials are invalid, credentials have to be of type OAuth1, got bearer or basic")]
271+
#[error(
272+
"failed to create signer as credentials are invalid, credentials have to be of type OAuth1, got bearer or basic"
273+
)]
272274
InvalidCredentials,
273275
}
274276

0 commit comments

Comments
 (0)