Skip to content

Commit

Permalink
fix: apparently we broken clap at some point
Browse files Browse the repository at this point in the history
  • Loading branch information
FauxFaux committed Mar 15, 2024
1 parent 04098b8 commit 94054ee
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ chrono = "0.4"
clap = { version = "4", optional = true, features = ["cargo"] }
deb-version = "0.1"
digest = { version = "0.10", features = ["std"] }
directories = "4"
directories = "5"
distro-keyring = "0.1"
filetime = "0.2"
flate2 = "1.0.12"
gpgrv = "0.4"
hex = "0.4"
insideout = "0.2"
jemallocator = { version = "0.3", optional = true }
mailparse = "0.13"
jemallocator = { version = "0.5", optional = true }
mailparse = "0.14"
md-5 = "0.10"
nom = "4"
reqwest = { version = "0.10", features = ["blocking"] }
reqwest = { version = "0.11", features = ["blocking"] }
sha2 = "0.10"
tempfile = "3"
tempfile-fast = "0.3"
Expand Down
8 changes: 4 additions & 4 deletions src/bin/fapt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ fn main() -> Result<(), anyhow::Error> {
.get_matches();

let mut sources_entries = Vec::with_capacity(16);
if let Some(prefix) = matches.get_one::<&str>("sources-list") {
if let Some(prefix) = matches.get_one::<String>("sources-list") {
for prefix in expand_dot_d(prefix)? {
sources_entries.extend(
sources_list::read(io::BufReader::new(fs::File::open(&prefix)?))
Expand All @@ -83,8 +83,8 @@ fn main() -> Result<(), anyhow::Error> {
}
}

if let Some(lines) = matches.get_many::<&str>("sources-line") {
for line in lines.copied() {
if let Some(lines) = matches.get_many::<String>("sources-line") {
for line in lines {
let entries = sources_list::read(io::Cursor::new(line))
.with_context(|| anyhow!("parsing command line: {:?}", line))?;

Expand Down Expand Up @@ -127,7 +127,7 @@ fn main() -> Result<(), anyhow::Error> {

system.set_arches(&arches);

system.set_dpkg_database(matches.get_one::<&Path>("system-dpkg").unwrap());
system.set_dpkg_database(matches.get_one::<String>("system-dpkg").unwrap());

match matches.subcommand() {
Some(("source-ninja", _)) => {
Expand Down

0 comments on commit 94054ee

Please sign in to comment.