mirror of
https://github.com/deuxfleurs-org/garage.git
synced 2026-08-28 07:57:02 +00:00
style: some small fixes
- remove invalid struct pattern lint message: struct pattern is not needed for a unit variant help: for further information visit https://rust-lang.github.io/rust-clippy/rust-1.92.0/index.html#unneeded_struct_pattern - remove call to default() on unit struct lint message: use of `default` to create a unit struct help: for further information visit https://rust-lang.github.io/rust-clippy/rust-1.92.0/index.html#default_constructed_unit_structs - replace if/else by direct affectation lint message: this if-then-else expression assigns a bool literal help: for further information visit https://rust-lang.github.io/rust-clippy/rust-1.92.0/index.html#needless_bool_assign - replace assert_eq on unit by `unwrap` + let typed binding
This commit is contained in:
@@ -139,11 +139,7 @@ fn parse_delete_objects_xml(xml: &roxmltree::Document) -> Option<DeleteRequest>
|
|||||||
key: key_str.to_string(),
|
key: key_str.to_string(),
|
||||||
});
|
});
|
||||||
} else if item.has_tag_name("Quiet") {
|
} else if item.has_tag_name("Quiet") {
|
||||||
if item.text()? == "true" {
|
ret.quiet = item.text()? == "true";
|
||||||
ret.quiet = true;
|
|
||||||
} else {
|
|
||||||
ret.quiet = false;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1011,7 +1011,7 @@ mod tests {
|
|||||||
// no bucket, won't work with the rest of the test suite
|
// no bucket, won't work with the rest of the test suite
|
||||||
assert!(matches!(
|
assert!(matches!(
|
||||||
parse("GET", "/", None, None).0,
|
parse("GET", "/", None, None).0,
|
||||||
Endpoint::ListBuckets { .. }
|
Endpoint::ListBuckets
|
||||||
));
|
));
|
||||||
assert!(matches!(
|
assert!(matches!(
|
||||||
parse("GET", "/", None, None).0.authorization_type(),
|
parse("GET", "/", None, None).0.authorization_type(),
|
||||||
|
|||||||
+2
-2
@@ -21,7 +21,7 @@ fn test_suite(db: Db) {
|
|||||||
let res = db.transaction::<_, (), _>(|tx| {
|
let res = db.transaction::<_, (), _>(|tx| {
|
||||||
assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), va);
|
assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), va);
|
||||||
|
|
||||||
assert_eq!(tx.insert(&tree, ka, vb).unwrap(), ());
|
let _: () = tx.insert(&tree, ka, vb).unwrap();
|
||||||
|
|
||||||
assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vb);
|
assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vb);
|
||||||
|
|
||||||
@@ -33,7 +33,7 @@ fn test_suite(db: Db) {
|
|||||||
let res = db.transaction::<(), _, _>(|tx| {
|
let res = db.transaction::<(), _, _>(|tx| {
|
||||||
assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vb);
|
assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vb);
|
||||||
|
|
||||||
assert_eq!(tx.insert(&tree, ka, vc).unwrap(), ());
|
let _: () = tx.insert(&tree, ka, vc).unwrap();
|
||||||
|
|
||||||
assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vc);
|
assert_eq!(tx.get(&tree, ka).unwrap().unwrap(), vc);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -87,7 +87,7 @@ where
|
|||||||
{
|
{
|
||||||
pub(crate) fn new(netapp: Arc<NetApp>, path: String) -> Self {
|
pub(crate) fn new(netapp: Arc<NetApp>, path: String) -> Self {
|
||||||
Self {
|
Self {
|
||||||
_phantom: PhantomData::default(),
|
_phantom: PhantomData,
|
||||||
netapp,
|
netapp,
|
||||||
path,
|
path,
|
||||||
handler: ArcSwapOption::from(None),
|
handler: ArcSwapOption::from(None),
|
||||||
|
|||||||
Reference in New Issue
Block a user