Skip to content

Commit

Permalink
Merge pull request #105 from Pi-Cla/patch-1
Browse files Browse the repository at this point in the history
Use get_flag instead of contains_id
  • Loading branch information
tummychow authored Mar 24, 2024
2 parents 6997063 + 30bede6 commit aca3e56
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,28 +102,28 @@ fn main() {
let drain = slog_async::Async::new(drain).build().fuse();
let drain = slog::LevelFilter::new(
drain,
if args.contains_id("verbose") {
if args.get_flag("verbose") {
slog::Level::Debug
} else {
slog::Level::Info
},
)
.fuse();
let mut logger = slog::Logger::root(drain, o!());
if args.contains_id("verbose") {
if args.get_flag("verbose") {
logger = logger.new(o!(
"module" => slog::FnValue(|record| record.module()),
"line" => slog::FnValue(|record| record.line()),
));
}

if let Err(e) = git_absorb::run(&mut git_absorb::Config {
dry_run: args.contains_id("dry-run"),
force: args.contains_id("force"),
dry_run: args.get_flag("dry-run"),
force: args.get_flag("force"),
base: args.get_one::<String>("base").map(|s| s.as_str()),
and_rebase: args.contains_id("and-rebase"),
whole_file: args.contains_id("whole-file"),
one_fixup_per_commit: args.contains_id("one-fixup-per-commit"),
and_rebase: args.get_flag("and-rebase"),
whole_file: args.get_flag("whole-file"),
one_fixup_per_commit: args.get_flag("one-fixup-per-commit"),
logger: &logger,
}) {
crit!(logger, "absorb failed"; "err" => e.to_string());
Expand Down

0 comments on commit aca3e56

Please sign in to comment.