Skip to content

Commit 0b23579

Browse files
drmingdrmerdrmingdrmer
committed
refactor: use rust edition 2024
1 parent 7016fa5 commit 0b23579

5 files changed

Lines changed: 156 additions & 120 deletions

File tree

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "validit"
33
readme = "README.md"
44
version = "0.2.5"
5-
edition = "2021"
5+
edition = "2024"
66
authors = [
77
"Zhang Yanpo <drdr.xp@gmail.com>",
88
]

‎src/bench.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
extern crate test;
22
use std::error::Error;
33

4-
use test::black_box;
54
use test::Bencher;
5+
use test::black_box;
66

7-
use crate::less_equal;
87
use crate::Valid;
98
use crate::Validate;
9+
use crate::less_equal;
1010

1111
struct Foo {
1212
a: u64,

‎src/macros_test.rs‎

Lines changed: 148 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -46,125 +46,163 @@ fn test_macro_be_true() {
4646
r
4747
}
4848

49-
assert!((|| {
50-
be_true!(arg0_true());
51-
Ok::<(), AnyError>(())
52-
})()
53-
.is_ok());
54-
assert!((|| {
55-
be_true!(arg1(true));
56-
Ok::<(), AnyError>(())
57-
})()
58-
.is_ok());
59-
assert!((|| {
60-
be_true!(arg2(true, 1));
61-
Ok::<(), AnyError>(())
62-
})()
63-
.is_ok());
64-
assert!((|| {
65-
be_true!(arg3(true, 1, 1));
66-
Ok::<(), AnyError>(())
67-
})()
68-
.is_ok());
69-
assert!((|| {
70-
be_true!(arg4(true, 1, 1, 1));
71-
Ok::<(), AnyError>(())
72-
})()
73-
.is_ok());
74-
assert!((|| {
75-
be_true!(arg5(true, 1, 1, 1, 1));
76-
Ok::<(), AnyError>(())
77-
})()
78-
.is_ok());
79-
assert!((|| {
80-
be_true!(arg6(true, 1, 1, 1, 1, 1));
81-
Ok::<(), AnyError>(())
82-
})()
83-
.is_ok());
84-
assert!((|| {
85-
be_true!(arg7(true, 1, 1, 1, 1, 1, 1));
86-
Ok::<(), AnyError>(())
87-
})()
88-
.is_ok());
89-
assert!((|| {
90-
be_true!(arg8(true, 1, 1, 1, 1, 1, 1, 1));
91-
Ok::<(), AnyError>(())
92-
})()
93-
.is_ok());
49+
assert!(
50+
(|| {
51+
be_true!(arg0_true());
52+
Ok::<(), AnyError>(())
53+
})()
54+
.is_ok()
55+
);
56+
assert!(
57+
(|| {
58+
be_true!(arg1(true));
59+
Ok::<(), AnyError>(())
60+
})()
61+
.is_ok()
62+
);
63+
assert!(
64+
(|| {
65+
be_true!(arg2(true, 1));
66+
Ok::<(), AnyError>(())
67+
})()
68+
.is_ok()
69+
);
70+
assert!(
71+
(|| {
72+
be_true!(arg3(true, 1, 1));
73+
Ok::<(), AnyError>(())
74+
})()
75+
.is_ok()
76+
);
77+
assert!(
78+
(|| {
79+
be_true!(arg4(true, 1, 1, 1));
80+
Ok::<(), AnyError>(())
81+
})()
82+
.is_ok()
83+
);
84+
assert!(
85+
(|| {
86+
be_true!(arg5(true, 1, 1, 1, 1));
87+
Ok::<(), AnyError>(())
88+
})()
89+
.is_ok()
90+
);
91+
assert!(
92+
(|| {
93+
be_true!(arg6(true, 1, 1, 1, 1, 1));
94+
Ok::<(), AnyError>(())
95+
})()
96+
.is_ok()
97+
);
98+
assert!(
99+
(|| {
100+
be_true!(arg7(true, 1, 1, 1, 1, 1, 1));
101+
Ok::<(), AnyError>(())
102+
})()
103+
.is_ok()
104+
);
105+
assert!(
106+
(|| {
107+
be_true!(arg8(true, 1, 1, 1, 1, 1, 1, 1));
108+
Ok::<(), AnyError>(())
109+
})()
110+
.is_ok()
111+
);
94112

95-
assert!((|| {
96-
be_true!(arg0_false());
97-
Ok::<(), AnyError>(())
98-
})()
99-
.unwrap_err()
100-
.to_string()
101-
.starts_with("expect to be true: arg0_false() at "));
113+
assert!(
114+
(|| {
115+
be_true!(arg0_false());
116+
Ok::<(), AnyError>(())
117+
})()
118+
.unwrap_err()
119+
.to_string()
120+
.starts_with("expect to be true: arg0_false() at ")
121+
);
102122

103-
assert!((|| {
104-
be_true!(arg1(false));
105-
Ok::<(), AnyError>(())
106-
})()
107-
.unwrap_err()
108-
.to_string()
109-
.starts_with("expect to be true: arg1(false(false)) at "));
123+
assert!(
124+
(|| {
125+
be_true!(arg1(false));
126+
Ok::<(), AnyError>(())
127+
})()
128+
.unwrap_err()
129+
.to_string()
130+
.starts_with("expect to be true: arg1(false(false)) at ")
131+
);
110132

111-
assert!((|| {
112-
be_true!(arg2(false, 1));
113-
Ok::<(), AnyError>(())
114-
})()
115-
.unwrap_err()
116-
.to_string()
117-
.starts_with("expect to be true: arg2(false(false), 1(1)) at "));
133+
assert!(
134+
(|| {
135+
be_true!(arg2(false, 1));
136+
Ok::<(), AnyError>(())
137+
})()
138+
.unwrap_err()
139+
.to_string()
140+
.starts_with("expect to be true: arg2(false(false), 1(1)) at ")
141+
);
118142

119-
assert!((|| {
120-
be_true!(arg3(false, 1, 1));
121-
Ok::<(), AnyError>(())
122-
})()
123-
.unwrap_err()
124-
.to_string()
125-
.starts_with("expect to be true: arg3(false(false), 1(1), 1(1)) at "));
143+
assert!(
144+
(|| {
145+
be_true!(arg3(false, 1, 1));
146+
Ok::<(), AnyError>(())
147+
})()
148+
.unwrap_err()
149+
.to_string()
150+
.starts_with("expect to be true: arg3(false(false), 1(1), 1(1)) at ")
151+
);
126152

127-
assert!((|| {
128-
be_true!(arg4(false, 1, 1, 1));
129-
Ok::<(), AnyError>(())
130-
})()
131-
.unwrap_err()
132-
.to_string()
133-
.starts_with("expect to be true: arg4(false(false), 1(1), 1(1), 1(1)) at "));
153+
assert!(
154+
(|| {
155+
be_true!(arg4(false, 1, 1, 1));
156+
Ok::<(), AnyError>(())
157+
})()
158+
.unwrap_err()
159+
.to_string()
160+
.starts_with("expect to be true: arg4(false(false), 1(1), 1(1), 1(1)) at ")
161+
);
134162

135-
assert!((|| {
136-
be_true!(arg5(false, 1, 1, 1, 1));
137-
Ok::<(), AnyError>(())
138-
})()
139-
.unwrap_err()
140-
.to_string()
141-
.starts_with("expect to be true: arg5(false(false), 1(1), 1(1), 1(1), 1(1)) at "));
163+
assert!(
164+
(|| {
165+
be_true!(arg5(false, 1, 1, 1, 1));
166+
Ok::<(), AnyError>(())
167+
})()
168+
.unwrap_err()
169+
.to_string()
170+
.starts_with("expect to be true: arg5(false(false), 1(1), 1(1), 1(1), 1(1)) at ")
171+
);
142172

143-
assert!((|| {
144-
be_true!(arg6(false, 1, 1, 1, 1, 1));
145-
Ok::<(), AnyError>(())
146-
})()
147-
.unwrap_err()
148-
.to_string()
149-
.starts_with("expect to be true: arg6(false(false), 1(1), 1(1), 1(1), 1(1), 1(1)) at "));
173+
assert!(
174+
(|| {
175+
be_true!(arg6(false, 1, 1, 1, 1, 1));
176+
Ok::<(), AnyError>(())
177+
})()
178+
.unwrap_err()
179+
.to_string()
180+
.starts_with("expect to be true: arg6(false(false), 1(1), 1(1), 1(1), 1(1), 1(1)) at ")
181+
);
150182

151-
assert!((|| {
152-
be_true!(arg7(false, 1, 1, 1, 1, 1, 1));
153-
Ok::<(), AnyError>(())
154-
})()
155-
.unwrap_err()
156-
.to_string()
157-
.starts_with("expect to be true: arg7(false(false), 1(1), 1(1), 1(1), 1(1), 1(1), 1(1)) at "));
183+
assert!(
184+
(|| {
185+
be_true!(arg7(false, 1, 1, 1, 1, 1, 1));
186+
Ok::<(), AnyError>(())
187+
})()
188+
.unwrap_err()
189+
.to_string()
190+
.starts_with(
191+
"expect to be true: arg7(false(false), 1(1), 1(1), 1(1), 1(1), 1(1), 1(1)) at "
192+
)
193+
);
158194

159-
assert!((|| {
160-
be_true!(arg8(false, 1, 1, 1, 1, 1, 1, 1));
161-
Ok::<(), AnyError>(())
162-
})()
163-
.unwrap_err()
164-
.to_string()
165-
.starts_with(
166-
"expect to be true: arg8(false(false), 1(1), 1(1), 1(1), 1(1), 1(1), 1(1), 1(1)) at "
167-
));
195+
assert!(
196+
(|| {
197+
be_true!(arg8(false, 1, 1, 1, 1, 1, 1, 1));
198+
Ok::<(), AnyError>(())
199+
})()
200+
.unwrap_err()
201+
.to_string()
202+
.starts_with(
203+
"expect to be true: arg8(false(false), 1(1), 1(1), 1(1), 1(1), 1(1), 1(1), 1(1)) at "
204+
)
205+
);
168206
}
169207

170208
#[test]

‎src/valid.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,10 @@ where T: Validate
9090

9191
fn deref(&self) -> &Self::Target {
9292
#[cfg(debug_assertions)]
93-
if self.enabled {
94-
if let Err(e) = self.inner.validate() {
93+
if self.enabled
94+
&& let Err(e) = self.inner.validate() {
9595
panic!("invalid state: {}", e);
9696
}
97-
}
9897

9998
&self.inner
10099
}
@@ -105,11 +104,10 @@ where T: Validate
105104
{
106105
fn deref_mut(&mut self) -> &mut Self::Target {
107106
#[cfg(debug_assertions)]
108-
if self.enabled {
109-
if let Err(e) = self.inner.validate() {
107+
if self.enabled
108+
&& let Err(e) = self.inner.validate() {
110109
panic!("invalid state: {}", e);
111110
}
112-
}
113111

114112
&mut self.inner
115113
}

‎src/valid_test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ use std::fmt::Display;
66
use std::fmt::Formatter;
77
use std::panic::UnwindSafe;
88

9+
use crate::ValidateExt;
910
use crate::less_equal;
1011
use crate::valid::Valid;
1112
use crate::validate::Validate;
12-
use crate::ValidateExt;
1313

1414
#[derive(Debug, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Copy)]
1515
struct Foo {

0 commit comments

Comments
 (0)