particle-os/particle-os-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Enable clippy nursery lint

Browse source
This commit is contained in:
Gerald Pinder 2024-02-10 15:32:20 -05:00
parent 421ca616e7
commit 6b4c86f01f
4 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/commands/bug_report.rs
View file

@ -126,14 +126,18 @@ impl BugReportCommand {
}
fn get_recipe(&self) -> Option<Recipe> {
let recipe_path = if let Some(recipe_path) = self.recipe_path.clone() {
recipe_path
} else if let Ok(recipe) = get_config_file("recipe", "Enter path to recipe file") {
recipe
} else {
trace!("Failed to get recipe");
String::new()
};
let recipe_path = self.recipe_path.clone().map_or_else(
|| {
get_config_file("recipe", "Enter path to recipe file").map_or_else(
|_| {
trace!("Failed to get recipe");
String::new()
},
|recipe| recipe,
)
},
|recipe_path| recipe_path,
);
Recipe::parse(&recipe_path).ok()
}
@ -263,7 +267,7 @@ fn get_shell_info() -> ShellInfo {
ShellInfo {
version,
name: current_shell.to_string(),
name: current_shell,
}
}

19
src/commands/build.rs
View file

@ -206,7 +206,7 @@ impl BuildCommand {
} else {
tags.first()
.map(|t| format!("{image_name}:{t}"))
.unwrap_or(image_name.to_string())
.unwrap_or_else(|| image_name.to_string())
};
debug!("Full tag is {first_image_name}");
@ -243,7 +243,7 @@ impl BuildCommand {
debug!("Pushing is enabled");
let credentials =
credentials.ok_or(anyhow!("Should have checked for creds earlier"))?;
credentials.ok_or_else(|| anyhow!("Should have checked for creds earlier"))?;
push_images_podman_api(&tags, &image_name, &first_image_name, &client, &credentials)
.await?;
@ -301,7 +301,7 @@ impl BuildCommand {
let credentials = self
.get_login_creds()
.ok_or(anyhow!("Unable to get credentials"))?;
.ok_or_else(|| anyhow!("Unable to get credentials"))?;
let (registry, username, password) = (
credentials.registry,
@ -437,7 +437,7 @@ impl BuildCommand {
} else {
tags.first()
.map(|t| format!("{image_name}:{t}"))
.unwrap_or(image_name.to_string())
.unwrap_or_else(|| image_name.to_string())
};
info!("Building image {full_image}");
@ -540,7 +540,7 @@ fn sign_images(image_name: &str, tag: Option<&str>) -> Result<()> {
let image_digest = get_image_digest(image_name, tag)?;
let image_name_tag = tag
.map(|t| format!("{image_name}:{t}"))
.unwrap_or(image_name.to_owned());
.unwrap_or_else(|| image_name.to_owned());
match (
env::var("CI_DEFAULT_BRANCH"),
@ -648,11 +648,10 @@ fn sign_images(image_name: &str, tag: Option<&str>) -> Result<()> {
fn get_image_digest(image_name: &str, tag: Option<&str>) -> Result<String> {
trace!("get_image_digest({image_name}, {tag:?})");
let image_url = if let Some(tag) = tag {
format!("docker://{image_name}:{tag}")
} else {
format!("docker://{image_name}")
};
let image_url = tag.map_or_else(
|| format!("docker://{image_name}"),
|tag| format!("docker://{image_name}:{tag}"),
);
trace!("skopeo inspect --format='{{.Digest}}' {image_url}");
let image_digest = String::from_utf8(