avoid some clippy warnings

This commit is contained in:
Dietmar Maurer
2019-10-26 11:36:01 +02:00
parent 834a2f95a0
commit 62ee2eb405
50 changed files with 179 additions and 246 deletions

View File

@ -108,8 +108,7 @@ fn get_dns(
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(
ApiMethod::new(
get_dns,
@ -135,7 +134,5 @@ pub fn router() -> Router {
.optional("dns3", THIRD_DNS_SERVER_SCHEMA.clone())
.optional("digest", PVE_CONFIG_DIGEST_SCHEMA.clone())
).protected(true)
);
route
)
}

View File

@ -17,13 +17,10 @@ fn get_network_config(
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(ApiMethod::new(
get_network_config,
ObjectSchema::new("Read network configuration.")
.required("node", NODE_SCHEMA.clone())
));
route
))
}

View File

@ -140,10 +140,8 @@ fn run_service_command(service: &str, cmd: &str) -> Result<Value, Error> {
_ => bail!("unknown service command '{}'", cmd),
}
if service == "proxmox-backup" {
if cmd != "restart" {
bail!("invalid service cmd '{} {}'", service, cmd);
}
if service == "proxmox-backup" && cmd != "restart" {
bail!("invalid service cmd '{} {}'", service, cmd);
}
let real_service_name = real_service_name(service);
@ -285,7 +283,7 @@ pub fn router() -> Router {
)
.list_subdirs();
let route = Router::new()
Router::new()
.get(
ApiMethod::new(
list_services,
@ -303,7 +301,5 @@ pub fn router() -> Router {
)
)
)
.match_all("service", service_api);
route
.match_all("service", service_api)
}

View File

@ -97,8 +97,7 @@ lazy_static! {
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(
ApiMethod::new(
get_syslog,
@ -134,7 +133,5 @@ pub fn router() -> Router {
.required("n", IntegerSchema::new("Line number."))
.required("t", StringSchema::new("Line text."))
).protected(true)
);
route
)
}

View File

@ -218,7 +218,7 @@ pub fn router() -> Router {
.list_subdirs();
let route = Router::new()
Router::new()
.get(ApiMethod::new(
list_tasks,
ObjectSchema::new("List tasks.")
@ -245,7 +245,5 @@ pub fn router() -> Router {
)
)
)
.match_all("upid", upid_api);
route
.match_all("upid", upid_api)
}

View File

@ -81,7 +81,7 @@ fn set_timezone(
}
pub fn router() -> Router {
let route = Router::new()
Router::new()
.get(
ApiMethod::new(
get_time,
@ -91,9 +91,9 @@ pub fn router() -> Router {
ObjectSchema::new("Returns server time and timezone.")
.required("timezone", StringSchema::new("Time zone"))
.required("time", IntegerSchema::new("Seconds since 1970-01-01 00:00:00 UTC.")
.minimum(1297163644))
.minimum(1_297_163_644))
.required("localtime", IntegerSchema::new("Seconds since 1970-01-01 00:00:00 UTC. (local time)")
.minimum(1297163644))
.minimum(1_297_163_644))
)
)
.put(
@ -104,7 +104,5 @@ pub fn router() -> Router {
.required("timezone", StringSchema::new(
"Time zone. The file '/usr/share/zoneinfo/zone.tab' contains the list of valid names."))
).protected(true).reload_timezone(true)
);
route
)
}