Skip to content

Commit

Permalink
Remove several more dead args.
Browse files Browse the repository at this point in the history
  • Loading branch information
macklin-10x committed Apr 18, 2024
1 parent 42c9073 commit 88f7c2c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 31 deletions.
1 change: 0 additions & 1 deletion enclone_args/src/proc_args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,6 @@ pub fn proc_args(ctl: &mut EncloneControl, args: &[String]) -> Result<(), String
("CONFIG", &mut ctl.gen_opt.config_file),
("GROUP_CDR3", &mut ctl.clono_group_opt.cdr3),
("PCHAINS", &mut ctl.parseable_opt.pchains),
("SESSION_NAME", &mut ctl.gen_opt.session_name),
("TRACE_BARCODE", &mut ctl.gen_opt.trace_barcode),
];

Expand Down
28 changes: 1 addition & 27 deletions enclone_args/src/process_special_arg1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use expr_tools::test_functions_in_node;
use io_utils::path_exists;
use itertools::Itertools;
use std::fmt::Write;
use std::fs::{read_to_string, remove_file, File};
use std::fs::{remove_file, File};
use string_utils::TextUtils;
use vector_utils::{unique_sort, VecUtils};

Expand Down Expand Up @@ -58,32 +58,6 @@ pub fn process_special_arg1(arg: &str, ctl: &mut EncloneControl) -> Result<bool,
return Err(format!("\nArgument {arg} is not properly specified.\n"));
}
ctl.gen_opt.chains_to_jun_align2.push(n.force_usize());
} else if arg.starts_with("STATE_NARRATIVE=") {
let mut narrative = arg.after("STATE_NARRATIVE=").to_string();
if narrative.starts_with('@') {
let filename = narrative.after("@");
if !path_exists(filename) {
return Err(
"\nThe file referenced by your STATE_NARRATIVE argument could not be found.\n"
.to_string(),
);
}
narrative = read_to_string(filename).unwrap();
ctl.gen_opt.state_narrative = narrative;
}
} else if arg.starts_with("SESSION_NARRATIVE=") {
let mut narrative = arg.after("SESSION_NARRATIVE=").to_string();
if narrative.starts_with('@') {
let filename = narrative.after("@");
if !path_exists(filename) {
return Err(
"\nThe file referenced by your SESSION_NARRATIVE argument could not be found.\n"
.to_string()
);
}
narrative = read_to_string(filename).unwrap();
ctl.gen_opt.session_narrative = narrative;
}
} else if arg.starts_with("JOIN_BASIC=") {
let val = arg.after("JOIN_BASIC=");
if val.parse::<f64>().is_err() || val.force_f64() < 0.0 || val.force_f64() > 100.0 {
Expand Down
3 changes: 0 additions & 3 deletions enclone_core/src/defs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -387,9 +387,6 @@ pub struct GeneralOpt {
pub mix_only: bool,
pub no_alt_alleles: bool,
pub vis_dump: bool,
pub session_name: String,
pub state_narrative: String,
pub session_narrative: String,
}

impl GeneralOpt {
Expand Down

0 comments on commit 88f7c2c

Please sign in to comment.