Skip to content

Commit

Permalink
chore: fix clippy issues
Browse files Browse the repository at this point in the history
  • Loading branch information
lleyton committed Jun 24, 2024
1 parent ef3d939 commit 09418f3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ pub async fn build_flatpak(

let mut builder = FlatpakBuilder::new(flat_out, flat_repo, flat_bundles);

for extra_source in &mut flatpak_opts.flatpak_extra_sources {
for extra_source in &mut flatpak_opts.extra_sources {
builder.add_extra_source(PathBuf::from(std::mem::take(extra_source)));
}

for extra_source_url in &mut flatpak_opts.flatpak_extra_sources_url {
for extra_source_url in &mut flatpak_opts.extra_sources_url {
builder.add_extra_source_url(std::mem::take(extra_source_url));
}

if !flatpak_opts.flatpak_dont_delete_build_dir {
if !flatpak_opts.dont_delete_build_dir {
builder.add_extra_args("--delete-build-dirs".to_string());
}

Expand Down Expand Up @@ -270,7 +270,7 @@ pub async fn build_project(

if let Some(rpmbuild) = &proj.rpm {
if let Some(srcdir) = &rpmbuild.sources {
rpm_opts.sources = srcdir.clone();
rpm_opts.sources.clone_from(srcdir);
}
rpm_opts.no_mirror = rbopts.no_mirrors;
rpm_opts.def_macro("_disable_source_fetch", "0");
Expand Down
6 changes: 3 additions & 3 deletions src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ pub struct FlatpakOpts {
/// Flatpak: Extra source directory
/// can be defined multiple times
#[clap(long, group = "extra-source")]
pub flatpak_extra_sources: Vec<String>,
pub extra_sources: Vec<String>,

/// Flatpak: Extra source URL
/// can be defined multiple times
#[clap(long)]
pub flatpak_extra_sources_url: Vec<String>,
pub extra_sources_url: Vec<String>,

/// Flatpak: Do not delete the build directory
#[clap(long, action)]
pub flatpak_dont_delete_build_dir: bool,
pub dont_delete_build_dir: bool,
}

#[derive(Args, Debug, Clone, Default)]
Expand Down

0 comments on commit 09418f3

Please sign in to comment.