Skip to content

Commit

Permalink
merge release/0.29 into master (#603)
Browse files Browse the repository at this point in the history
* fix: fixed wildcard handling on windows (#602)
  • Loading branch information
pamburus authored Dec 17, 2024
2 parents 9f27511 + 7323688 commit 3fecfdb
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
18 changes: 17 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ members = [".", "crate/encstr"]
[workspace.package]
repository = "https://github.com/pamburus/hl"
authors = ["Pavel Ivanov <[email protected]>"]
version = "0.30.0-alpha.2"
version = "0.30.0-alpha.3"
edition = "2021"
license = "MIT"

Expand Down Expand Up @@ -78,6 +78,7 @@ strum = { version = "0", features = ["derive"] }
thiserror = "2"
titlecase = "3"
toml = "0"
wild = "2"
wildflower = { git = "https://github.com/cassaundra/wildflower.git" }
winapi-util = { version = "0" }
wyhash = "0"
Expand Down
2 changes: 1 addition & 1 deletion src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl BootstrapOpt {
}

pub fn args() -> Vec<String> {
let mut args = std::env::args();
let mut args = wild::args();
let Some(first) = args.next() else {
return vec![];
};
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fn run() -> Result<()> {
let settings = config::load(cli::BootstrapOpt::parse().args.config.as_deref())?;
config::global::initialize(settings.clone());

let opt = cli::Opt::parse();
let opt = cli::Opt::parse_from(wild::args());
if opt.help {
return cli::Opt::command().print_help().map_err(Error::Io);
}
Expand Down

0 comments on commit 3fecfdb

Please sign in to comment.