tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

misc clippy fixes

Browse Source 
the trivial ones ;)

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2022-02-08 14:57:16 +01:00
parent bb9e503964
commit dcf5a0f62d
32 changed files with 74 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pbs-tape/src/bin/pmtx.rs
View File

@ -243,7 +243,7 @@ fn unload(
if let Some(to_slot) = status.find_free_slot(false) {
sg_pt_changer::unload(&mut file, to_slot, drivenum)?;
return Ok(());
Ok(())
} else {
bail!("Drive '{}' unload failure - no free slot", drivenum);
}

4
pbs-tape/src/blocked_reader.rs
View File

@ -116,13 +116,13 @@ impl <R: BlockRead> BlockedReader<R> {
proxmox_sys::io_bail!("detected tape block after block-stream end marker");
}
Err(BlockReadError::EndOfFile) => {
return Ok(());
Ok(())
}
Err(BlockReadError::EndOfStream) => {
proxmox_sys::io_bail!("got unexpected end of tape");
}
Err(BlockReadError::Error(err)) => {
return Err(err);
Err(err)
}
}
}

6
pbs-tape/src/sg_pt_changer.rs
View File

@ -471,7 +471,7 @@ pub fn read_element_status<F: AsRawFd>(file: &mut F) -> Result<MtxStatus, Error>
for drive in status.drives.iter_mut() {
if let Some(source_address) = drive.loaded_slot {
let source_address = source_address as u16;
drive.loaded_slot = slot_map.get(&source_address).map(|v| *v);
drive.loaded_slot = slot_map.get(&source_address).copied();
}
}
@ -672,7 +672,7 @@ fn decode_element_status_page(
import_export_slots: Vec::new(),
};
let mut reader = &data[..];
let mut reader = data;
let head: ElementStatusHeader = unsafe { reader.read_be_value()? };
@ -715,7 +715,7 @@ fn decode_element_status_page(
}
for descriptor in descr_data.chunks_exact(descr_len) {
let mut reader = &descriptor[..];
let mut reader = descriptor;
match subhead.element_type_code {
1 => {

18
pbs-tape/src/sg_tape.rs
View File

@ -79,7 +79,7 @@ impl DataCompressionModePage {
if enable {
self.flags2 |= 128;
} else {
self.flags2 = self.flags2 & 127;
self.flags2 &= 127;
}
}
@ -389,7 +389,7 @@ impl SgTape {
bail!("got unexpected data len ({} != {}", data.len(), expected_size);
}
let mut reader = &data[..];
let mut reader = data;
let page: ReadPositionLongPage = unsafe { reader.read_be_value()? };
@ -445,10 +445,8 @@ impl SgTape {
sg_raw.do_command(&cmd)
.map_err(|err| format_err!("move to EOD failed - {}", err))?;
if write_missing_eof {
if !self.check_filemark()? {
self.write_filemarks(1, false)?;
}
if write_missing_eof && !self.check_filemark()? {
self.write_filemarks(1, false)?;
}
Ok(())
@ -611,7 +609,7 @@ impl SgTape {
/// Read Volume Statistics
pub fn volume_statistics(&mut self) -> Result<Lp17VolumeStatistics, Error> {
return read_volume_statistics(&mut self.file);
read_volume_statistics(&mut self.file)
}
pub fn set_encryption(
@ -651,9 +649,9 @@ impl SgTape {
//println!("WRITE {:?}", data);
match sg_raw.do_out_command(&cmd, data) {
Ok(()) => { return Ok(false) }
Ok(()) => { Ok(false) }
Err(ScsiError::Sense(SenseInfo { sense_key: 0, asc: 0, ascq: 2 })) => {
return Ok(true); // LEOM
Ok(true) // LEOM
}
Err(err) => {
proxmox_sys::io_bail!("write failed - {}", err);
@ -910,7 +908,7 @@ impl SgTape {
// assume max. 16000 medium passes
// see: https://en.wikipedia.org/wiki/Linear_Tape-Open
let wearout: f64 = (passes as f64)/(16000.0 as f64);
let wearout: f64 = (passes as f64)/16000.0_f64;
status.medium_passes = Some(passes);
status.medium_wearout = Some(wearout);

4
pbs-tape/src/sg_tape/encryption.rs
View File

@ -217,7 +217,7 @@ struct SspDataEncryptionAlgorithmDescriptor {
fn decode_spin_data_encryption_caps(data: &[u8]) -> Result<u8, Error> {
proxmox_lang::try_block!({
let mut reader = &data[..];
let mut reader = data;
let _page: SspDataEncryptionCapabilityPage = unsafe { reader.read_be_value()? };
let mut aes_gcm_index = None;
@ -268,7 +268,7 @@ struct SspDataEncryptionStatusPage {
fn decode_spin_data_encryption_status(data: &[u8]) -> Result<DataEncryptionStatus, Error> {
proxmox_lang::try_block!({
let mut reader = &data[..];
let mut reader = data;
let page: SspDataEncryptionStatusPage = unsafe { reader.read_be_value()? };
if page.page_code != 0x20 {

2
pbs-tape/src/sg_tape/mam.rs
View File

@ -123,7 +123,7 @@ pub fn read_mam_attributes<F: AsRawFd>(file: &mut F) -> Result<Vec<MamAttribute>
fn decode_mam_attributes(data: &[u8]) -> Result<Vec<MamAttribute>, Error> {
let mut reader = &data[..];
let mut reader = data;
let data_len: u32 = unsafe { reader.read_be_value()? };

2
pbs-tape/src/sg_tape/report_density.rs
View File

@ -39,7 +39,7 @@ pub fn report_density<F: AsRawFd>(file: &mut F) -> Result<u8, Error> {
let mut max_density = 0u8;
proxmox_lang::try_block!({
let mut reader = &data[..];
let mut reader = data;
let page_len: u16 = unsafe { reader.read_be_value()? };
let page_len = page_len as usize;

16
pbs-tape/src/sgutils2.rs
View File

@ -91,7 +91,7 @@ impl SgPt {
/// Peripheral device type text (see `inquiry` command)
///
/// see <https://en.wikipedia.org/wiki/SCSI_Peripheral_Device_Type>
pub const PERIPHERAL_DEVICE_TYPE_TEXT: [&'static str; 32] = [
pub const PERIPHERAL_DEVICE_TYPE_TEXT: [&str; 32] = [
"Disk Drive",
"Tape Drive",
"Printer",
@ -142,7 +142,7 @@ pub const SENSE_KEY_VOLUME_OVERFLOW: u8 = 0x0d;
pub const SENSE_KEY_MISCOMPARE: u8 = 0x0e;
/// Sense Key Descriptions
pub const SENSE_KEY_DESCRIPTIONS: [&'static str; 16] = [
pub const SENSE_KEY_DESCRIPTIONS: [&str; 16] = [
"No Sense",
"Recovered Error",
"Not Ready",
@ -486,13 +486,13 @@ impl <'a, F: AsRawFd> SgRaw<'a, F> {
let res_cat = unsafe { get_scsi_pt_result_category(ptvp.as_ptr()) };
match res_cat {
SCSI_PT_RESULT_GOOD => return Ok(()),
SCSI_PT_RESULT_GOOD => Ok(()),
SCSI_PT_RESULT_STATUS => {
let status = unsafe { get_scsi_pt_status_response(ptvp.as_ptr()) };
if status != 0 {
return Err(format_err!("unknown scsi error - status response {}", status).into());
}
return Ok(());
Ok(())
}
SCSI_PT_RESULT_SENSE => {
if sense_len == 0 {
@ -528,7 +528,7 @@ impl <'a, F: AsRawFd> SgRaw<'a, F> {
}
};
return Err(ScsiError::Sense(sense));
Err(ScsiError::Sense(sense))
}
SCSI_PT_RESULT_TRANSPORT_ERR => return Err(format_err!("scsi command failed: transport error").into()),
SCSI_PT_RESULT_OS_ERR => {
@ -676,7 +676,7 @@ pub fn scsi_inquiry<F: AsRawFd>(
.map_err(|err| format_err!("SCSI inquiry failed - {}", err))?;
proxmox_lang::try_block!({
let mut reader = &data[..];
let mut reader = data;
let page: InquiryPage = unsafe { reader.read_be_value()? };
@ -725,7 +725,7 @@ pub fn scsi_mode_sense<F: AsRawFd, P: Endian>(
.map_err(|err| format_err!("mode sense failed - {}", err))?;
proxmox_lang::try_block!({
let mut reader = &data[..];
let mut reader = data;
let head: ModeParameterHeader = unsafe { reader.read_be_value()? };
let expected_len = head.mode_data_len as usize + 2;
@ -788,7 +788,7 @@ pub fn scsi_request_sense<F: AsRawFd>(
bail!("received unexpected sense code '0x{:02x}'", code);
}
let mut reader = &data[..];
let mut reader = data;
let sense: RequestSenseFixed = unsafe { reader.read_be_value()? };