Skip to content

Commit c23114b

Browse files
committed
chore(foundationdb): clippy
1 parent 5241604 commit c23114b

File tree

7 files changed

+21
-23
lines changed

7 files changed

+21
-23
lines changed

foundationdb/examples/class-scheduling.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ async fn simulate_students(student_id: usize, num_ops: usize) {
297297
for _ in 0..num_ops {
298298
let mut moods = Vec::<Mood>::new();
299299

300-
if my_classes.len() > 0 {
300+
if !my_classes.is_empty() {
301301
moods.push(Mood::Ditch);
302302
moods.push(Mood::Switch);
303303
}
@@ -306,7 +306,7 @@ async fn simulate_students(student_id: usize, num_ops: usize) {
306306
moods.push(Mood::Add);
307307
}
308308

309-
let mood = moods.choose(&mut rng).map(|mood| *mood).unwrap();
309+
let mood = moods.choose(&mut rng).copied().unwrap();
310310

311311
// on errors we recheck for available classes
312312
if perform_op(

foundationdb/src/directory/mod.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ impl DirectoryLayer {
148148
) -> Result<Subspace, DirectoryError> {
149149
self.check_version(trx, allow_create).await?;
150150

151-
if prefix.len() > 0 && !self.allow_manual_prefixes {
152-
if self.path.len() == 0 {
151+
if !prefix.is_empty() && !self.allow_manual_prefixes {
152+
if self.path.is_empty() {
153153
return Err(DirectoryError::Message(
154154
"cannot specify a prefix unless manual prefixes are enabled".to_string(),
155155
));
@@ -160,7 +160,7 @@ impl DirectoryLayer {
160160
));
161161
}
162162

163-
if paths.len() == 0 {
163+
if paths.is_empty() {
164164
return Err(DirectoryError::NoPathProvided);
165165
}
166166

@@ -177,7 +177,7 @@ impl DirectoryLayer {
177177
return Err(DirectoryError::DirAlreadyExists);
178178
}
179179

180-
if self.layer.len() > 0 {
180+
if !self.layer.is_empty() {
181181
node.check_layer(self.layer.to_owned())?;
182182
}
183183

@@ -282,12 +282,10 @@ impl DirectoryLayer {
282282

283283
node.retrieve_layer(&trx).await?;
284284

285-
match trx.get(node.node_subspace.bytes(), false).await? {
286-
Some(fdb_slice) => {
287-
node.content_subspace = Some(Subspace::from_bytes(&*fdb_slice));
288-
}
289-
_ => {} // noop in case of a none existing node
285+
if let Some(fdb_slice) = trx.get(node.node_subspace.bytes(), false).await? {
286+
node.content_subspace = Some(Subspace::from_bytes(&*fdb_slice));
290287
}
288+
291289
nodes.push(node);
292290
}
293291

foundationdb/src/directory/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl Node {
4949

5050
self.content_subspace = Some(new_subspace.to_owned());
5151

52-
Ok(new_subspace.clone())
52+
Ok(new_subspace)
5353
}
5454

5555
/// retrieve the layer used for this node

foundationdb/src/tuple/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,11 @@ mod tests {
274274

275275
// versionstamp
276276
test_serde(
277-
Versionstamp::complete(b"\xaa\xbb\xcc\xdd\xee\xff\x00\x01\x02\x03".clone(), 0),
277+
Versionstamp::complete(*b"\xaa\xbb\xcc\xdd\xee\xff\x00\x01\x02\x03", 0),
278278
b"\x33\xaa\xbb\xcc\xdd\xee\xff\x00\x01\x02\x03\x00\x00",
279279
);
280280
test_serde(
281-
Versionstamp::complete(b"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a".clone(), 657),
281+
Versionstamp::complete(*b"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a", 657),
282282
b"\x33\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x02\x91",
283283
);
284284

@@ -627,21 +627,21 @@ mod tests {
627627
test_serde(Element::Int(-1), &[0x13, 254]);
628628
test_serde(
629629
Element::Versionstamp(Versionstamp::complete(
630-
b"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a".clone(),
630+
*b"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a",
631631
657,
632632
)),
633633
b"\x33\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x02\x91",
634634
);
635635
test_serde(
636636
(Element::Versionstamp(Versionstamp::complete(
637-
b"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a".clone(),
637+
*b"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a",
638638
657,
639639
)),),
640640
b"\x33\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x02\x91",
641641
);
642642
test_serde(
643643
(Element::Versionstamp(Versionstamp::complete(
644-
b"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a".clone(),
644+
*b"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a",
645645
657,
646646
)),),
647647
b"\x33\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x02\x91",

foundationdb/tests/range.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ async fn test_get_range_async() -> FdbResult<()> {
5151
let len = range.len();
5252
let mut i = 0;
5353
for kv in &range {
54-
assert!(kv.key().len() > 0);
55-
assert!(kv.value().len() > 0);
54+
assert!(!kv.key().is_empty());
55+
assert!(!kv.value().is_empty());
5656
i += 1;
5757
}
5858
assert_eq!(i, len);

foundationdb/tests/tokio.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ async fn do_transact() {
2222
.expect("failed to open fdb"),
2323
);
2424

25-
let adb = db.clone();
25+
let adb = db;
2626
tokio::spawn(async move {
2727
async fn txnfn(_txn: &Transaction) -> FdbResult<()> {
2828
Ok(())
@@ -45,7 +45,7 @@ async fn do_trx() {
4545
.expect("failed to open fdb"),
4646
);
4747

48-
let adb = db.clone();
48+
let adb = db;
4949
tokio::spawn(async move {
5050
adb.create_trx()
5151
.expect("failed to create trx")

foundationdb/tests/watch.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn test_watch() {
1717
}
1818

1919
async fn test_watch_async() -> FdbResult<()> {
20-
const KEY: &'static [u8] = b"test-watch";
20+
const KEY: &[u8] = b"test-watch";
2121

2222
let db = common::database().await?;
2323

@@ -40,7 +40,7 @@ async fn test_watch_async() -> FdbResult<()> {
4040
}
4141

4242
async fn test_watch_without_commit_async() -> FdbResult<()> {
43-
const KEY: &'static [u8] = b"test-watch-2";
43+
const KEY: &[u8] = b"test-watch-2";
4444

4545
let db = common::database().await?;
4646

0 commit comments

Comments
 (0)