some clippy fixups

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

src/api_schema/config.rs

@@ -17,7 +17,7 @@ impl ApiConfig {
     pub fn new<B: Into<PathBuf>>(basedir: B, router: &'static Router, env_type: RpcEnvironmentType) -> Self {
         Self {
             basedir: basedir.into(),
-            router: router,
+            router,
             aliases: HashMap::new(),
             env_type,
         }

src/api_schema/schema.rs

@@ -61,7 +61,7 @@ impl BooleanSchema {
 
     pub fn new(description: &'static str) -> Self {
         BooleanSchema {
-            description: description,
+            description,
             default: None,
         }
     }
@@ -84,7 +84,7 @@ impl IntegerSchema {
 
     pub fn new(description: &'static str) -> Self {
         IntegerSchema {
-            description: description,
+            description,
             default: None,
             minimum: None,
             maximum: None,
@@ -138,7 +138,7 @@ impl StringSchema {
 
     pub fn new(description: &'static str) -> Self {
         StringSchema {
-            description: description,
+            description,
             default: None,
             min_length: None,
             max_length: None,
@@ -225,7 +225,7 @@ impl ArraySchema {
 
     pub fn new(description: &'static str, item_schema: Arc<Schema>) -> Self {
         ArraySchema {
-            description: description,
+            description,
             items: item_schema,
             min_length: None,
             max_length: None,
@@ -273,9 +273,9 @@ impl ObjectSchema {
     pub fn new(description: &'static str) -> Self {
         let properties = HashMap::new();
         ObjectSchema {
-            description: description,
+            description,
             additional_properties: false,
-            properties: properties,
+            properties,
             default_key: None,
         }
     }
@@ -426,8 +426,8 @@ fn parse_property_string(value_str: &str, schema: &Schema) -> Result<Value, Erro
                 }
             }
 
-            return parse_parameter_strings(&param_list, &object_schema, true)
+            parse_parameter_strings(&param_list, &object_schema, true)
-                .map_err(Error::from);
+                .map_err(Error::from)
 
         }
         Schema::Array(array_schema) => {
@@ -440,13 +440,12 @@ fn parse_property_string(value_str: &str, schema: &Schema) -> Result<Value, Erro
             }
             array_schema.check_length(array.len())?;
 
-            return Ok(array.into());
+            Ok(array.into())
         }
         _ => {
             bail!("Got unexpetec schema type.")
         }
     }
-
 }
 
 pub fn parse_simple_value(value_str: &str, schema: &Schema) -> Result<Value, Error> {

src/backup/catalog_blob.rs

@@ -162,7 +162,7 @@ impl <R: Read + BufRead> CatalogBlobReader<R> {
             write!(out, " {} {}", size, dt.to_rfc3339_opts(chrono::SecondsFormat::Secs, false))?;
         }
 
-        write!(out, "\n")?;
+        writeln!(out)?;
         std::io::stdout().write_all(&out)?;
 
         Ok(())

src/backup/chunker.rs

@@ -99,8 +99,8 @@ impl Chunker {
             chunk_size_max: chunk_size_avg << 2,
             _chunk_size_avg: chunk_size_avg,
             _discriminator: discriminator,
-            break_test_mask: break_test_mask,
+            break_test_mask,
-            break_test_minimum: break_test_minimum,
+            break_test_minimum,
             window: [0u8; CA_CHUNKER_WINDOW_SIZE],
         }
     }

src/backup/data_chunk.rs

@@ -217,12 +217,12 @@ impl DataChunk {
                 bail!("encrypted chunk too small ({} bytes).", data.len());
             }
 
-            let chunk = DataChunk { digest: digest, raw_data: data };
+            let chunk = DataChunk { digest, raw_data: data };
 
             Ok(chunk)
         } else if magic == COMPRESSED_CHUNK_MAGIC_1_0 || magic == UNCOMPRESSED_CHUNK_MAGIC_1_0 {
 
-            let chunk = DataChunk { digest: digest, raw_data: data };
+            let chunk = DataChunk { digest, raw_data: data };
 
             Ok(chunk)
         } else {

src/backup/dynamic_index.rs

@@ -275,8 +275,8 @@ impl <S: ReadChunk> BufferedDynamicReader<S> {
         let archive_size = index.chunk_end(index.index_entries - 1);
         Self {
             store,
-            index: index,
+            index,
-            archive_size: archive_size,
+            archive_size,
             read_buffer: Vec::with_capacity(1024*1024),
             buffered_chunk_idx: 0,
             buffered_chunk_start: 0,
@@ -456,7 +456,7 @@ impl DynamicIndexWriter {
         Ok(Self {
             store,
             _lock: shared_lock,
-            writer: writer,
+            writer,
             closed: false,
             filename: full_path,
             tmp_filename: tmp_path,

src/backup/fixed_index.rs

@@ -453,8 +453,8 @@ impl <S: ReadChunk> BufferedFixedReader<S> {
         let archive_size = index.size;
         Self {
             store,
-            index: index,
+            index,
-            archive_size: archive_size,
+            archive_size,
             read_buffer: Vec::with_capacity(1024*1024),
             buffered_chunk_idx: 0,
             buffered_chunk_start: 0,

src/buildcfg.rs

@@ -1,7 +1,7 @@
 //! Exports configuration data from the build system
 
 /// The configured configuration directory
-pub const CONFIGDIR: &'static str = "/etc/proxmox-backup";
+pub const CONFIGDIR: &str = "/etc/proxmox-backup";
 pub const JS_DIR: &str = "/usr/share/javascript/proxmox-backup";
 
 /// Prepend configuration directory to a file name

src/cli/command.rs

@@ -344,7 +344,7 @@ fn print_property_completion(
             return;
         }
     }
-    println!("");
+    println!();
 }
 
 fn record_done_argument(done: &mut HashMap<String, String>, parameters: &ObjectSchema, key: &str, value: &str) {

src/pxar/decoder.rs

@@ -39,7 +39,7 @@ impl<R: Read + Seek, F: Fn(&Path) -> Result<(), Error>> Decoder<R, F> {
         Ok(Self {
             inner: SequentialDecoder::new(reader, super::flags::DEFAULT, callback),
             root_start: 0,
-            root_end: root_end,
+            root_end,
         })
     }
 
@@ -52,7 +52,7 @@ impl<R: Read + Seek, F: Fn(&Path) -> Result<(), Error>> Decoder<R, F> {
             start: self.root_start,
             end: self.root_end,
             filename: OsString::new(), // Empty
-            entry: entry,
+            entry,
         })
     }
 
@@ -106,8 +106,8 @@ impl<R: Read + Seek, F: Fn(&Path) -> Result<(), Error>> Decoder<R, F> {
 
         Ok(DirectoryEntry {
             start: entry_start,
-            end: end,
+            end,
-            filename: filename,
+            filename,
             entry,
         })
     }

src/pxar/encoder.rs

@@ -115,7 +115,7 @@ impl<'a, W: Write, C: BackupCatalogWriter> Encoder<'a, W, C> {
         let mut me = Self {
             base_path: path,
             relative_path: PathBuf::new(),
-            writer: writer,
+            writer,
             writer_pos: 0,
             catalog,
             _size: 0,
@@ -192,7 +192,7 @@ impl<'a, W: Write, C: BackupCatalogWriter> Encoder<'a, W, C> {
         }
 
         let entry = PxarEntry {
-            mode: mode,
+            mode,
             flags: 0,
             uid: stat.st_uid,
             gid: stat.st_gid,
@@ -303,7 +303,7 @@ impl<'a, W: Write, C: BackupCatalogWriter> Encoder<'a, W, C> {
             } else if self.has_features(flags::WITH_XATTRS) {
                 xattrs.push(PxarXAttr {
                     name: name.to_vec(),
-                    value: value,
+                    value,
                 });
             }
         }
@@ -374,13 +374,13 @@ impl<'a, W: Write, C: BackupCatalogWriter> Encoder<'a, W, C> {
                 acl::ACL_USER => {
                     acl_user.push(PxarACLUser {
                         uid: entry.get_qualifier()?,
-                        permissions: permissions,
+                        permissions,
                     });
                 }
                 acl::ACL_GROUP => {
                     acl_group.push(PxarACLGroup {
                         gid: entry.get_qualifier()?,
-                        permissions: permissions,
+                        permissions,
                     });
                 }
                 _ => bail!("Unexpected ACL tag encountered!"),

src/section_config.rs

@@ -78,7 +78,7 @@ impl SectionConfig {
     pub fn new(id_schema: Arc<Schema>) -> Self {
         Self {
             plugins: HashMap::new(),
-            id_schema: id_schema,
+            id_schema,
             parse_section_header: SectionConfig::default_parse_section_header,
             parse_section_content: SectionConfig::default_parse_section_content,
             format_section_header: SectionConfig::default_format_section_header,

src/server/worker_task.rs

@@ -382,7 +382,7 @@ impl WorkerTask {
         update_active_workers(Some(&upid))?;
 
         let worker = Arc::new(Self {
-            upid: upid,
+            upid,
             abort_requested: AtomicBool::new(false),
             data: Mutex::new(WorkerTaskData {
                 logger,

src/tools/process_locker.rs

@@ -104,7 +104,7 @@ impl ProcessLocker {
             .open(lockfile)?;
 
         Ok(Arc::new(Mutex::new(Self {
-            file: file,
+            file,
             exclusive: false,
             writers: 0,
             next_guard_id: 0,