cargo fmt

This commit is contained in:
weisd
2024-11-03 10:05:50 +08:00
parent c3ef8bf5cd
commit d4a220bddc
4 changed files with 116 additions and 121 deletions
@@ -1,10 +1,9 @@
// automatically generated by the FlatBuffers compiler, do not modify // automatically generated by the FlatBuffers compiler, do not modify
// @generated // @generated
use core::mem;
use core::cmp::Ordering; use core::cmp::Ordering;
use core::mem;
extern crate flatbuffers; extern crate flatbuffers;
use self::flatbuffers::{EndianScalar, Follow}; use self::flatbuffers::{EndianScalar, Follow};
@@ -12,8 +11,8 @@ use self::flatbuffers::{EndianScalar, Follow};
#[allow(unused_imports, dead_code)] #[allow(unused_imports, dead_code)]
pub mod models { pub mod models {
use core::mem;
use core::cmp::Ordering; use core::cmp::Ordering;
use core::mem;
extern crate flatbuffers; extern crate flatbuffers;
use self::flatbuffers::{EndianScalar, Follow}; use self::flatbuffers::{EndianScalar, Follow};
@@ -29,7 +28,9 @@ impl<'a> flatbuffers::Follow<'a> for PingBody<'a> {
type Inner = PingBody<'a>; type Inner = PingBody<'a>;
#[inline] #[inline]
unsafe fn follow(buf: &'a [u8], loc: usize) -> Self::Inner { unsafe fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
Self { _tab: flatbuffers::Table::new(buf, loc) } Self {
_tab: flatbuffers::Table::new(buf, loc),
}
} }
} }
@@ -47,28 +48,30 @@ impl<'a> PingBody<'a> {
#[allow(unused_mut)] #[allow(unused_mut)]
pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr, A: flatbuffers::Allocator + 'bldr>( pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr, A: flatbuffers::Allocator + 'bldr>(
_fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr, A>, _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr, A>,
args: &'args PingBodyArgs<'args> args: &'args PingBodyArgs<'args>,
) -> flatbuffers::WIPOffset<PingBody<'bldr>> { ) -> flatbuffers::WIPOffset<PingBody<'bldr>> {
let mut builder = PingBodyBuilder::new(_fbb); let mut builder = PingBodyBuilder::new(_fbb);
if let Some(x) = args.payload { builder.add_payload(x); } if let Some(x) = args.payload {
builder.add_payload(x);
}
builder.finish() builder.finish()
} }
#[inline] #[inline]
pub fn payload(&self) -> Option<flatbuffers::Vector<'a, u8>> { pub fn payload(&self) -> Option<flatbuffers::Vector<'a, u8>> {
// Safety: // Safety:
// Created from valid Table for this object // Created from valid Table for this object
// which contains a valid value in this slot // which contains a valid value in this slot
unsafe { self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'a, u8>>>(PingBody::VT_PAYLOAD, None)} unsafe {
self._tab
.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'a, u8>>>(PingBody::VT_PAYLOAD, None)
}
} }
} }
impl flatbuffers::Verifiable for PingBody<'_> { impl flatbuffers::Verifiable for PingBody<'_> {
#[inline] #[inline]
fn run_verifier( fn run_verifier(v: &mut flatbuffers::Verifier, pos: usize) -> Result<(), flatbuffers::InvalidFlatbuffer> {
v: &mut flatbuffers::Verifier, pos: usize
) -> Result<(), flatbuffers::InvalidFlatbuffer> {
use self::flatbuffers::Verifiable; use self::flatbuffers::Verifiable;
v.visit_table(pos)? v.visit_table(pos)?
.visit_field::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'_, u8>>>("payload", Self::VT_PAYLOAD, false)? .visit_field::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'_, u8>>>("payload", Self::VT_PAYLOAD, false)?
@@ -82,9 +85,7 @@ pub struct PingBodyArgs<'a> {
impl<'a> Default for PingBodyArgs<'a> { impl<'a> Default for PingBodyArgs<'a> {
#[inline] #[inline]
fn default() -> Self { fn default() -> Self {
PingBodyArgs { PingBodyArgs { payload: None }
payload: None,
}
} }
} }
@@ -95,7 +96,8 @@ pub struct PingBodyBuilder<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> {
impl<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> PingBodyBuilder<'a, 'b, A> { impl<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> PingBodyBuilder<'a, 'b, A> {
#[inline] #[inline]
pub fn add_payload(&mut self, payload: flatbuffers::WIPOffset<flatbuffers::Vector<'b, u8>>) { pub fn add_payload(&mut self, payload: flatbuffers::WIPOffset<flatbuffers::Vector<'b, u8>>) {
self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(PingBody::VT_PAYLOAD, payload); self.fbb_
.push_slot_always::<flatbuffers::WIPOffset<_>>(PingBody::VT_PAYLOAD, payload);
} }
#[inline] #[inline]
pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>) -> PingBodyBuilder<'a, 'b, A> { pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>) -> PingBodyBuilder<'a, 'b, A> {
@@ -120,4 +122,3 @@ impl core::fmt::Debug for PingBody<'_> {
} }
} }
} // pub mod models } // pub mod models
+4 -6
View File
@@ -152,7 +152,7 @@ pub async fn list_path_raw(mut rx: B_Receiver<bool>, opts: ListPathRawOptions) -
None => { None => {
at_eof += 1; at_eof += 1;
continue; continue;
}, }
}; };
// If no current, add it. // If no current, add it.
if current.name.is_empty() { if current.name.is_empty() {
@@ -189,16 +189,14 @@ pub async fn list_path_raw(mut rx: B_Receiver<bool>, opts: ListPathRawOptions) -
finished_fn(&errs); finished_fn(&errs);
} }
let mut combined_err = Vec::new(); let mut combined_err = Vec::new();
errs.iter().zip(opts.disks.iter()).for_each(|(err, disk)| { errs.iter().zip(opts.disks.iter()).for_each(|(err, disk)| match (err, disk) {
match (err, disk) {
(Some(err), Some(disk)) => { (Some(err), Some(disk)) => {
combined_err.push(format!("drive {} returned: {}", disk.to_string(), err)); combined_err.push(format!("drive {} returned: {}", disk.to_string(), err));
}, }
(Some(err), None) => { (Some(err), None) => {
combined_err.push(err.to_string()); combined_err.push(err.to_string());
},
_ => {},
} }
_ => {}
}); });
return Err(Error::from_string(combined_err.join(", "))); return Err(Error::from_string(combined_err.join(", ")));
+1 -1
View File
@@ -428,7 +428,7 @@ pub fn is_all_not_found(errs: &[Option<Error>]) -> bool {
match err { match err {
DiskError::FileNotFound | DiskError::VolumeNotFound | &DiskError::FileVersionNotFound => { DiskError::FileNotFound | DiskError::VolumeNotFound | &DiskError::FileVersionNotFound => {
continue; continue;
}, }
_ => return false, _ => return false,
} }
} }
+1 -5
View File
@@ -8,11 +8,7 @@ use tokio::{
}, },
}; };
use crate::{ use crate::{error::Error, heal::heal_ops::NOP_HEAL, utils::path::SLASH_SEPARATOR};
error::Error,
heal::heal_ops::NOP_HEAL,
utils::path::SLASH_SEPARATOR,
};
use super::{ use super::{
heal_commands::{HealOpts, HealResultItem}, heal_commands::{HealOpts, HealResultItem},