twin/lazymc
1
0
Fork 0
mirror of https://github.com/timvisee/lazymc.git synced 2025-07-26 09:42:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Resolve clippy warnings

Browse Source
This commit is contained in:
timvisee
2021-11-24 14:02:08 +01:00
parent 9e08ed6cda
commit 6b23490919
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.rs
View File

@@ -208,13 +208,9 @@ impl Server {
/// ///
/// This does not check whether it exists. /// This does not check whether it exists.
pub fn server_directory(config: &Config) -> Option<PathBuf> { pub fn server_directory(config: &Config) -> Option<PathBuf> {
if config.server.directory.is_none() {
return None;
}
// Get directory, relative to config directory if known // Get directory, relative to config directory if known
match config.path.as_ref().and_then(|p| p.parent()) { match config.path.as_ref().and_then(|p| p.parent()) {
Some(config_dir) => Some(config_dir.join(config.server.directory.as_ref().unwrap())), Some(config_dir) => Some(config_dir.join(config.server.directory.as_ref()?)),
None => config.server.directory.clone(), None => config.server.directory.clone(),
} }
} }

2
src/server.rs
View File

@@ -508,7 +508,7 @@ async fn stop_server_rcon(config: &Config, server: &Server) -> bool {
} }
// Create RCON client // Create RCON client
let mut rcon = match Rcon::connect_config(&config).await { let mut rcon = match Rcon::connect_config(config).await {
Ok(rcon) => rcon, Ok(rcon) => rcon,
Err(err) => { Err(err) => {
error!(target: "lazymc", "Failed to RCON server to sleep: {}", err); error!(target: "lazymc", "Failed to RCON server to sleep: {}", err);

2
src/status.rs
View File

@@ -238,7 +238,7 @@ async fn server_status(client_info: &ClientInfo, config: &Config, server: &Serve
favicon = status.as_ref().unwrap().favicon.clone() favicon = status.as_ref().unwrap().favicon.clone()
} }
if favicon.is_none() { if favicon.is_none() {
favicon = Some(server_favicon(&config).await); favicon = Some(server_favicon(config).await);
} }
} }