From ade209591974ac39d373ca29184a250ea969e293 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 24 Jan 2021 17:26:50 -0800 Subject: [PATCH] Remove unused --no-build-substitutes Ended up not implementing this. --- src/command/apply.rs | 6 ------ src/nix/deployment.rs | 8 -------- 2 files changed, 14 deletions(-) diff --git a/src/command/apply.rs b/src/command/apply.rs index 56e740b..defc35d 100644 --- a/src/command/apply.rs +++ b/src/command/apply.rs @@ -76,11 +76,6 @@ Set to 0 to disable parallemism limit. .help("Be verbose") .long_help("Deactivates the progress spinner and prints every line of output.") .takes_value(false)) - .arg(Arg::with_name("no-build-substitutes") - .long("no-build-substitutes") - .help("Do not use substitutes during build") - .long_help("Disables the use of substituters when building.") - .takes_value(false)) .arg(Arg::with_name("no-substitutes") .long("no-substitutes") .help("Do not use substitutes") @@ -153,7 +148,6 @@ pub async fn run(_global_args: &ArgMatches<'_>, local_args: &ArgMatches<'_>) { let mut deployment = Deployment::new(hive, targets, goal); let mut options = DeploymentOptions::default(); - options.set_substituters_build(!local_args.is_present("no-build-substitutes")); options.set_substituters_push(!local_args.is_present("no-substitutes")); options.set_gzip(!local_args.is_present("no-gzip")); options.set_progress_bar(!local_args.is_present("verbose")); diff --git a/src/nix/deployment.rs b/src/nix/deployment.rs index 6656ab6..e2afcba 100644 --- a/src/nix/deployment.rs +++ b/src/nix/deployment.rs @@ -508,9 +508,6 @@ pub struct DeploymentOptions { /// If set to false, verbose logs will be displayed instead. progress_bar: bool, - /// Whether to use binary caches when building. - substituters_build: bool, - /// Whether to use binary caches when copying closures to remote hosts. substituters_push: bool, @@ -522,7 +519,6 @@ impl Default for DeploymentOptions { fn default() -> Self { Self { progress_bar: true, - substituters_build: true, substituters_push: true, gzip: true, } @@ -534,10 +530,6 @@ impl DeploymentOptions { self.progress_bar = value; } - pub fn set_substituters_build(&mut self, value: bool) { - self.substituters_build = value; - } - pub fn set_substituters_push(&mut self, value: bool) { self.substituters_push = value; }