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

6
pbs-config/src/key_config.rs
View File

@ -119,7 +119,7 @@ impl KeyConfig {
/// Creates a new, unencrypted key.
pub fn without_password(raw_key: [u8; 32]) -> Result<Self, Error> {
// always compute fingerprint
let crypt_config = CryptConfig::new(raw_key.clone())?;
let crypt_config = CryptConfig::new(raw_key)?;
let fingerprint = Some(Fingerprint::new(crypt_config.fingerprint()));
let created = proxmox_time::epoch_i64();
@ -186,7 +186,7 @@ impl KeyConfig {
let created = proxmox_time::epoch_i64();
// always compute fingerprint
let crypt_config = CryptConfig::new(raw_key.clone())?;
let crypt_config = CryptConfig::new(*raw_key)?;
let fingerprint = Some(Fingerprint::new(crypt_config.fingerprint()));
Ok(Self {
@ -257,7 +257,7 @@ impl KeyConfig {
let mut result = [0u8; 32];
result.copy_from_slice(&key);
let crypt_config = CryptConfig::new(result.clone())?;
let crypt_config = CryptConfig::new(result)?;
let fingerprint = Fingerprint::new(crypt_config.fingerprint());
if let Some(ref stored_fingerprint) = self.fingerprint {
if &fingerprint != stored_fingerprint {

10
pbs-config/src/network/mod.rs
View File

@ -492,7 +492,7 @@ mod test {
let input = "";
let mut parser = NetworkParser::new(&input.as_bytes()[..]);
let mut parser = NetworkParser::new(input.as_bytes());
let config = parser.parse_interfaces(None)?;
@ -502,7 +502,7 @@ mod test {
assert_eq!(output, expected);
// run again using output as input
let mut parser = NetworkParser::new(&output.as_bytes()[..]);
let mut parser = NetworkParser::new(output.as_bytes());
let config = parser.parse_interfaces(None)?;
@ -518,7 +518,7 @@ mod test {
let input = "#c1\n\n#c2\n\niface test inet manual\n";
let mut parser = NetworkParser::new(&input.as_bytes()[..]);
let mut parser = NetworkParser::new(input.as_bytes());
let config = parser.parse_interfaces(None)?;
@ -546,7 +546,7 @@ mod test {
iface ens21 inet manual\n\
iface ens22 inet manual\n";
let mut parser = NetworkParser::new(&input.as_bytes()[..]);
let mut parser = NetworkParser::new(input.as_bytes());
let config = parser.parse_interfaces(None)?;
@ -597,7 +597,7 @@ mod test {
\taddress fe80::5496:35ff:fe99:5a6a/64\n\
\tgateway fe80::1\n";
let mut parser = NetworkParser::new(&input.as_bytes()[..]);
let mut parser = NetworkParser::new(input.as_bytes());
let config = parser.parse_interfaces(None)?;

4
pbs-config/src/network/parser.rs
View File

@ -421,7 +421,7 @@ impl <R: BufRead> NetworkParser<R> {
address_family_v6 = true;
}
if let Some(mut interface) = config.interfaces.get_mut(&iface) {
if let Some(interface) = config.interfaces.get_mut(&iface) {
if address_family_v4 {
set_method_v4(interface, config_method)?;
}
@ -429,7 +429,7 @@ impl <R: BufRead> NetworkParser<R> {
set_method_v6(interface, config_method)?;
}
self.parse_iface_attributes(&mut interface, address_family_v4, address_family_v6)?;
self.parse_iface_attributes(interface, address_family_v4, address_family_v6)?;
} else {
let mut interface = Interface::new(iface.clone());
if address_family_v4 {

6
pbs-config/src/tape_encryption_keys.rs
View File

@ -167,10 +167,8 @@ pub fn insert_key(key: [u8;32], key_config: KeyConfig, force: bool) -> Result<()
None => bail!("missing encryption key fingerprint - internal error"),
};
if !force {
if config_map.get(&fingerprint).is_some() {
bail!("encryption key '{}' already exists.", fingerprint);
}
if !force && config_map.get(&fingerprint).is_some() {
bail!("encryption key '{}' already exists.", fingerprint);
}
let item = EncryptionKeyInfo::new(key, fingerprint.clone());