Skip to content

Commit 5cc1d33

Browse files
darkskygitdarkskygit
committed
fix: clippy
1 parent e57a9cb commit 5cc1d33

File tree

15 files changed

+90
-78
lines changed

15 files changed

+90
-78
lines changed

‎libs/jwst-codec/src/codec/integer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ mod tests {
146146
test_var_uint_enc_dec(0b10_0000_0000);
147147
test_var_uint_enc_dec(0b11_1111_1111);
148148
test_var_uint_enc_dec(0x7fff_ffff_ffff_ffff);
149-
test_var_uint_enc_dec(u64::max_value());
149+
test_var_uint_enc_dec(u64::MAX);
150150
}
151151

152152
#[test]

‎libs/jwst-codec/src/doc/awareness.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ mod tests {
210210

211211
let values: MutexGuard<Vec<AwarenessEvent>> = values.lock().unwrap();
212212
assert_eq!(values.len(), 4);
213-
let event = values.get(0).unwrap();
213+
let event = values.first().unwrap();
214214

215215
let mut added = event.added.clone();
216216
added.sort();

‎libs/jwst-codec/src/doc/codec/delete_set.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ impl<W: CrdtWriter> CrdtWrite<W> for DeleteSet {
166166
}
167167

168168
#[cfg(test)]
169+
#[allow(clippy::single_range_in_vec_init)]
169170
mod tests {
170171
use super::*;
171172

‎libs/jwst-codec/src/doc/codec/item.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,10 +376,13 @@ impl Item {
376376

377377
#[cfg(test)]
378378
mod tests {
379+
#[cfg(not(loom))]
379380
use proptest::{collection::vec, prelude::*};
380381

382+
#[cfg(not(loom))]
381383
use super::*;
382384

385+
#[cfg(not(loom))]
383386
fn item_round_trip(item: &mut Item) -> JwstCodecResult {
384387
if !item.is_valid() {
385388
return Ok(());

‎libs/jwst-codec/src/doc/codec/item_flag.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ mod tests {
110110
fn test_flag_set_and_clear() {
111111
{
112112
let flag = super::ItemFlag::default();
113-
assert_eq!(flag.keep(), false);
113+
assert!(!flag.keep());
114114
flag.set_keep();
115-
assert_eq!(flag.keep(), true);
115+
assert!(flag.keep());
116116
flag.clear_keep();
117-
assert_eq!(flag.keep(), false);
117+
assert!(!flag.keep());
118118
assert_eq!(
119119
flag.0.load(Ordering::SeqCst),
120120
ItemFlag::default().0.load(Ordering::SeqCst)
@@ -123,11 +123,11 @@ mod tests {
123123

124124
{
125125
let flag = super::ItemFlag::default();
126-
assert_eq!(flag.countable(), false);
126+
assert!(!flag.countable());
127127
flag.set_countable();
128-
assert_eq!(flag.countable(), true);
128+
assert!(flag.countable());
129129
flag.clear_countable();
130-
assert_eq!(flag.countable(), false);
130+
assert!(!flag.countable());
131131
assert_eq!(
132132
flag.0.load(Ordering::SeqCst),
133133
ItemFlag::default().0.load(Ordering::SeqCst)
@@ -136,11 +136,11 @@ mod tests {
136136

137137
{
138138
let flag = super::ItemFlag::default();
139-
assert_eq!(flag.deleted(), false);
139+
assert!(!flag.deleted());
140140
flag.set_deleted();
141-
assert_eq!(flag.deleted(), true);
141+
assert!(flag.deleted());
142142
flag.clear_deleted();
143-
assert_eq!(flag.deleted(), false);
143+
assert!(!flag.deleted());
144144
assert_eq!(
145145
flag.0.load(Ordering::SeqCst),
146146
ItemFlag::default().0.load(Ordering::SeqCst)
@@ -152,15 +152,15 @@ mod tests {
152152
flag.set_keep();
153153
flag.set_countable();
154154
flag.set_deleted();
155-
assert_eq!(flag.keep(), true);
156-
assert_eq!(flag.countable(), true);
157-
assert_eq!(flag.deleted(), true);
155+
assert!(flag.keep());
156+
assert!(flag.countable());
157+
assert!(flag.deleted());
158158
flag.clear_keep();
159159
flag.clear_countable();
160160
flag.clear_deleted();
161-
assert_eq!(flag.keep(), false);
162-
assert_eq!(flag.countable(), false);
163-
assert_eq!(flag.deleted(), false);
161+
assert!(!flag.keep());
162+
assert!(!flag.countable());
163+
assert!(!flag.deleted());
164164
assert_eq!(
165165
flag.0.load(Ordering::SeqCst),
166166
ItemFlag::default().0.load(Ordering::SeqCst)

‎libs/jwst-codec/src/doc/codec/refs.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ impl From<Option<&Node>> for Somr<Item> {
344344

345345
#[cfg(test)]
346346
mod tests {
347+
#[cfg(not(loom))]
347348
use proptest::{collection::vec, prelude::*};
348349

349350
use super::{utils::ItemBuilder, *};
@@ -440,6 +441,7 @@ mod tests {
440441
});
441442
}
442443

444+
#[cfg(not(loom))]
443445
fn struct_info_round_trip(info: &mut Node) -> JwstCodecResult {
444446
if let Node::Item(item) = info {
445447
if let Some(item) = item.get_mut() {

‎libs/jwst-codec/src/doc/common/range.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ pub struct OrderRangeIter<'a> {
303303
idx: usize,
304304
}
305305

306-
impl<'a> Iterator for OrderRangeIter<'a> {
306+
impl Iterator for OrderRangeIter<'_> {
307307
type Item = Range<u64>;
308308

309309
fn next(&mut self) -> Option<Self::Item> {
@@ -330,6 +330,7 @@ impl<'a> Iterator for OrderRangeIter<'a> {
330330
}
331331

332332
#[cfg(test)]
333+
#[allow(clippy::single_range_in_vec_init)]
333334
mod tests {
334335
use super::OrderRange;
335336
#[test]

‎libs/jwst-codec/src/doc/common/somr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ pub(crate) struct InnerRefMut<'a, T> {
5050
_marker: PhantomData<&'a mut T>,
5151
}
5252

53-
impl<'a, T> Deref for InnerRefMut<'a, T> {
53+
impl<T> Deref for InnerRefMut<'_, T> {
5454
type Target = T;
5555

5656
fn deref(&self) -> &Self::Target {
5757
unsafe { &*self.inner.as_ptr() }
5858
}
5959
}
6060

61-
impl<'a, T> DerefMut for InnerRefMut<'a, T> {
61+
impl<T> DerefMut for InnerRefMut<'_, T> {
6262
fn deref_mut(&mut self) -> &mut Self::Target {
6363
unsafe { &mut *self.inner.as_ptr() }
6464
}

‎libs/jwst-codec/src/doc/document.rs

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -409,14 +409,14 @@ mod tests {
409409

410410
let map = yrs_doc.get_or_insert_map("abc");
411411
let mut trx = yrs_doc.transact_mut();
412-
map.insert(&mut trx, "a", 1).unwrap();
413-
let binary = trx.encode_update_v1().unwrap();
412+
map.insert(&mut trx, "a", 1);
413+
let binary = trx.encode_update_v1();
414414

415415
let yrs_doc_new = yrs::Doc::with_options(yrs_options_right.clone());
416416
let array = yrs_doc_new.get_or_insert_array("array");
417417
let mut trx = yrs_doc_new.transact_mut();
418-
array.insert(&mut trx, 0, "array_value").unwrap();
419-
let binary_new = trx.encode_update_v1().unwrap();
418+
array.insert(&mut trx, 0, "array_value");
419+
let binary_new = trx.encode_update_v1();
420420

421421
(binary, binary_new)
422422
};
@@ -446,20 +446,21 @@ mod tests {
446446
let doc = yrs::Doc::with_options(yrs_options.clone());
447447
let array = doc.get_or_insert_array("abc");
448448
let mut trx = doc.transact_mut();
449-
array.insert(&mut trx, 0, 42).unwrap();
450-
array.insert(&mut trx, 1, -42).unwrap();
451-
array.insert(&mut trx, 2, true).unwrap();
452-
array.insert(&mut trx, 3, false).unwrap();
453-
array.insert(&mut trx, 4, "hello").unwrap();
454-
array.insert(&mut trx, 5, "world").unwrap();
449+
array.insert(&mut trx, 0, 42);
450+
array.insert(&mut trx, 1, -42);
451+
array.insert(&mut trx, 2, true);
452+
array.insert(&mut trx, 3, false);
453+
array.insert(&mut trx, 4, "hello");
454+
array.insert(&mut trx, 5, "world");
455455

456456
let sub_array = yrs::ArrayPrelim::default();
457-
let sub_array = array.insert(&mut trx, 6, sub_array).unwrap();
458-
sub_array.insert(&mut trx, 0, 1).unwrap();
457+
let sub_array = array.insert(&mut trx, 6, sub_array);
458+
sub_array.insert(&mut trx, 0, 1);
459459

460460
drop(trx);
461-
462-
assert_json_diff::assert_json_eq!(array.to_json(&doc.transact()), json);
461+
let config = assert_json_diff::Config::new(assert_json_diff::CompareMode::Strict)
462+
.numeric_mode(assert_json_diff::NumericMode::AssumeFloat);
463+
assert_json_diff::assert_json_matches!(array.to_json(&doc.transact()), json, config);
463464
};
464465

465466
let binary = {
@@ -483,9 +484,11 @@ mod tests {
483484
let ydoc = yrs::Doc::with_options(yrs_options);
484485
let array = ydoc.get_or_insert_array("abc");
485486
let mut trx = ydoc.transact_mut();
486-
trx.apply_update(yrs::Update::decode_v1(&binary).unwrap());
487+
trx.apply_update(yrs::Update::decode_v1(&binary).unwrap()).unwrap();
487488

488-
assert_json_diff::assert_json_eq!(array.to_json(&trx), json);
489+
let config = assert_json_diff::Config::new(assert_json_diff::CompareMode::Strict)
490+
.numeric_mode(assert_json_diff::NumericMode::AssumeFloat);
491+
assert_json_diff::assert_json_matches!(array.to_json(&trx), json, config);
489492

490493
let mut doc = Doc::new();
491494
let array = doc.get_or_create_array("abc").unwrap();

‎libs/jwst-codec/src/doc/publisher.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ mod tests {
175175
loom_model!({
176176
let doc = Doc::default();
177177

178-
let ret = vec![
178+
let ret = [
179179
vec![vec!["(1, 0)", "test.key1", "val1"]],
180180
vec![vec!["(1, 1)", "test.key2", "val2"], vec!["(1, 2)", "test.key3", "val3"]],
181181
vec![

0 commit comments

Comments
 (0)