Skip to content

Commit d5bacfb

Browse files
build!: upgrade MSRV to v1.89
1 parent 2542ab1 commit d5bacfb

File tree

7 files changed

+22
-25
lines changed

7 files changed

+22
-25
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ jobs:
7070
rust: beta
7171
- name: nightly
7272
rust: nightly
73-
- name: 1.85.0
74-
rust: 1.85.0
73+
- name: 1.89.0
74+
rust: 1.89.0
7575

7676
steps:
7777
- uses: actions/checkout@v5

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ resolver = "2"
1313
edition = "2024"
1414
license = "MIT OR Apache-2.0"
1515
repository = "https://github.com/M4SS-Code/watermelon"
16-
rust-version = "1.85"
16+
rust-version = "1.89"
1717

1818
[workspace.lints.rust]
1919
unsafe_code = "deny"

watermelon-mini/src/proto/connector.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,9 @@ pub(crate) async fn connect(
198198
#[cfg(feature = "non-standard-zstd")]
199199
match conn {
200200
Connection::Streaming(streaming) => {
201-
if zstd {
202-
if let Some(zstd_compression_level) = flags.zstd_compression_level {
203-
let stream = streaming.socket_mut().0.take().unwrap();
204-
streaming.socket_mut().0 =
205-
Some(stream.upgrade_zstd(zstd_compression_level));
206-
}
201+
if zstd && let Some(zstd_compression_level) = flags.zstd_compression_level {
202+
let stream = streaming.socket_mut().0.take().unwrap();
203+
streaming.socket_mut().0 = Some(stream.upgrade_zstd(zstd_compression_level));
207204
}
208205
}
209206
Connection::Websocket(_websocket) => {}

watermelon-proto/src/headers/name.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ impl HeaderName {
8282
)]
8383
#[must_use]
8484
pub fn from_dangerous_value(value: ByteString) -> Self {
85-
if cfg!(debug_assertions) {
86-
if let Err(err) = validate_header_name(&value) {
87-
panic!("HeaderName {value:?} isn't valid {err:?}");
88-
}
85+
if cfg!(debug_assertions)
86+
&& let Err(err) = validate_header_name(&value)
87+
{
88+
panic!("HeaderName {value:?} isn't valid {err:?}");
8989
}
9090
Self(UniCase::new(value))
9191
}

watermelon-proto/src/headers/value.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ impl HeaderValue {
5353
reason = "The header validation is only made in debug"
5454
)]
5555
pub fn from_dangerous_value(value: ByteString) -> Self {
56-
if cfg!(debug_assertions) {
57-
if let Err(err) = validate_header_value(&value) {
58-
panic!("HeaderValue {value:?} isn't valid {err:?}");
59-
}
56+
if cfg!(debug_assertions)
57+
&& let Err(err) = validate_header_value(&value)
58+
{
59+
panic!("HeaderValue {value:?} isn't valid {err:?}");
6060
}
6161
Self(value)
6262
}

watermelon-proto/src/queue_group.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ impl QueueGroup {
5454
reason = "The queue group validation is only made in debug"
5555
)]
5656
pub fn from_dangerous_value(value: ByteString) -> Self {
57-
if cfg!(debug_assertions) {
58-
if let Err(err) = validate_queue_group(&value) {
59-
panic!("QueueGroup {value:?} isn't valid {err:?}");
60-
}
57+
if cfg!(debug_assertions)
58+
&& let Err(err) = validate_queue_group(&value)
59+
{
60+
panic!("QueueGroup {value:?} isn't valid {err:?}");
6161
}
6262
Self(value)
6363
}

watermelon-proto/src/subject.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ impl Subject {
5555
)]
5656
#[must_use]
5757
pub fn from_dangerous_value(value: ByteString) -> Self {
58-
if cfg!(debug_assertions) {
59-
if let Err(err) = validate_subject(&value) {
60-
panic!("Subject {value:?} isn't valid {err:?}");
61-
}
58+
if cfg!(debug_assertions)
59+
&& let Err(err) = validate_subject(&value)
60+
{
61+
panic!("Subject {value:?} isn't valid {err:?}");
6262
}
6363
Self(value)
6464
}

0 commit comments

Comments
 (0)