diff --git a/src/lib.rs b/src/lib.rs index e81dd87..46a700b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,7 +7,8 @@ unused_extern_crates, unused_import_braces, unused_qualifications, - variant_size_differences + variant_size_differences, + clippy::use_self )] #![warn(unused_results)] /* diff --git a/src/resources/mod.rs b/src/resources/mod.rs index 5a9e048..f2f1363 100644 --- a/src/resources/mod.rs +++ b/src/resources/mod.rs @@ -3,7 +3,7 @@ pub struct Resource(pub String, pub String); impl<'a> Resource { pub fn new, B: Into>(rtype: A, value: B) -> Self { - Resource(rtype.into(), value.into()) + Self(rtype.into(), value.into()) } pub fn get_type(&self) -> &str { diff --git a/src/schema.rs b/src/schema.rs index ba430a3..2489c74 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -144,7 +144,7 @@ where R: SymbolRunner, { pub fn new(symbol_runner: R) -> Self { - NonRepeatingSymbolRunner { + Self { upstream: symbol_runner, done: RefCell::new(HashSet::new()), } diff --git a/src/storage.rs b/src/storage.rs index 450ce05..197884b 100644 --- a/src/storage.rs +++ b/src/storage.rs @@ -14,7 +14,7 @@ pub struct SimpleStorage(String, String); impl SimpleStorage { pub fn new(base: String, filename: String) -> Self { - SimpleStorage(base, filename) + Self(base, filename) } fn get_path(&self, date: Option) -> String { diff --git a/src/symbols/acme/user.rs b/src/symbols/acme/user.rs index e121ae6..208a21b 100644 --- a/src/symbols/acme/user.rs +++ b/src/symbols/acme/user.rs @@ -18,17 +18,9 @@ pub fn new<'a, R: CommandRunner, C: 'a + AsRef, U: 'a + AsRef + Clone, let account_key_file = path("account.key"); List::from(( AcmeAccountKey::new(account_key_file.clone(), command_runner), - Owner::new( - account_key_file, - user_name.clone(), - command_runner, - ), + Owner::new(account_key_file, user_name.clone(), command_runner), Dir::new(path("challenges")), - Owner::new( - path("challenges"), - user_name.clone(), - command_runner, - ), + Owner::new(path("challenges"), user_name.clone(), command_runner), Dir::new("/etc/ssl/local_certs"), Owner::new("/etc/ssl/local_certs", user_name, command_runner), File::new(path("lets_encrypt_x3_cross_signed.pem"), cert), diff --git a/src/symbols/dir.rs b/src/symbols/dir.rs index d2414f3..7eb33ef 100644 --- a/src/symbols/dir.rs +++ b/src/symbols/dir.rs @@ -13,7 +13,7 @@ pub struct Dir> { impl> Dir { pub fn new(path: D) -> Self { - Dir { path } + Self { path } } } diff --git a/src/symbols/factory.rs b/src/symbols/factory.rs index 642fdbb..58b20a8 100644 --- a/src/symbols/factory.rs +++ b/src/symbols/factory.rs @@ -1,5 +1,4 @@ use std::borrow::Cow; - use std::path::Path; use std::path::PathBuf; diff --git a/src/symbols/file.rs b/src/symbols/file.rs index 1c20183..ca773a5 100644 --- a/src/symbols/file.rs +++ b/src/symbols/file.rs @@ -16,7 +16,7 @@ pub struct File, D: AsRef> { impl, D: AsRef> File { pub fn new(path: D, content: C) -> Self { - File { path, content } + Self { path, content } } } diff --git a/src/symbols/hook.rs b/src/symbols/hook.rs index d81e1d2..3ab2660 100644 --- a/src/symbols/hook.rs +++ b/src/symbols/hook.rs @@ -20,7 +20,7 @@ where B: Symbol, { pub fn new(a: A, b: B) -> Self { - Hook { a, b } + Self { a, b } } } diff --git a/src/symbols/nginx/server.rs b/src/symbols/nginx/server.rs index 97a82e0..a4344ea 100644 --- a/src/symbols/nginx/server.rs +++ b/src/symbols/nginx/server.rs @@ -15,7 +15,7 @@ pub enum NginxServerError { } impl From for NginxServerError { - fn from(err: io::Error) -> NginxServerError { + fn from(err: io::Error) -> Self { NginxServerError::ExecError(err) } } @@ -23,8 +23,8 @@ impl From for NginxServerError { impl Error for NginxServerError { fn description(&self) -> &str { match self { - NginxServerError::ExecError(ref e) => e.description(), - NginxServerError::GenericError => "Generic error", + Self::ExecError(ref e) => e.description(), + Self::GenericError => "Generic error", } } fn cause(&self) -> Option<&dyn Error> { @@ -75,7 +75,7 @@ server {{ ) } -pub fn php_server_config_snippet<'a, SOCKET: AsRef, STATIC: AsRef>( +pub fn php_server_config_snippet, STATIC: AsRef>( socket_path: SOCKET, static_path: STATIC, ) -> String { @@ -109,7 +109,7 @@ pub struct LocalTcpSocket(usize); impl LocalTcpSocket { pub fn new(x: usize) -> Self { - LocalTcpSocket(x) + Self(x) } } diff --git a/src/symbols/owner.rs b/src/symbols/owner.rs index 6196a62..42892c7 100644 --- a/src/symbols/owner.rs +++ b/src/symbols/owner.rs @@ -1,4 +1,3 @@ - use std::error::Error; use std::fmt; diff --git a/src/symbols/systemd/user_service.rs b/src/symbols/systemd/user_service.rs index e76ae9c..a169153 100644 --- a/src/symbols/systemd/user_service.rs +++ b/src/symbols/systemd/user_service.rs @@ -3,7 +3,6 @@ use std::error::Error; use std::ffi::OsStr; use std::fmt; use std::io; - use std::path::Path; use std::path::PathBuf; use std::process::Output; @@ -23,8 +22,8 @@ pub enum UserServiceError { } impl From for UserServiceError { - fn from(err: io::Error) -> UserServiceError { - UserServiceError::ExecError(err) + fn from(err: io::Error) -> Self { + Self::ExecError(err) } }