Skip to content

Commit

Permalink
Merge branch 'main' of github.com:01mf02/jaq
Browse files Browse the repository at this point in the history
  • Loading branch information
01mf02 committed Dec 4, 2024
2 parents ef8b082 + b50f483 commit d5e481c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion jaq/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ impl Cli {
// handle all arguments after "--"
"" => args.try_for_each(|arg| self.positional(mode, arg))?,

"null-input" => self.short('N', args)?,
"null-input" => self.short('n', args)?,
"raw-input" => self.short('R', args)?,
"slurp" => self.short('s', args)?,

Expand Down
2 changes: 1 addition & 1 deletion jaq/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ fn binds(cli: &Cli) -> Result<Vec<(String, Val)>, Error> {
let s = std::fs::read_to_string(path).map_err(|e| Error::Io(Some(format!("{path:?}")), e));
Ok((k.to_owned(), Val::Str(s?.into())))
});
let slurpfile = cli.rawfile.iter().map(|(k, path)| {
let slurpfile = cli.slurpfile.iter().map(|(k, path)| {
let a = json_array(path).map_err(|e| Error::Io(Some(format!("{path:?}")), e));
Ok((k.to_owned(), a?))
});
Expand Down

0 comments on commit d5e481c

Please sign in to comment.