Archives/xplr
2
0
Fork 0
mirror of https://github.com/sayanarijit/xplr synced 2024-11-04 18:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve errors messages -m and -M

Browse Source
This commit is contained in:
Arijit Basu 2022-10-26 17:43:05 +05:30
parent b05e702536
commit 4a34780eb4
No known key found for this signature in database
GPG Key ID: 0F8EF5258DC38077
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cli.rs
View File

@ -178,7 +178,7 @@ fn fmt_msg_in(args: Vec<String>) -> Result<String> {
let mut msg = "".to_string();
let mut last_char = None;
for ch in format.chars() {
for (col, ch) in format.chars().enumerate() {
match (ch, last_char) {
('%', Some('%')) => {
msg.push(ch);
@ -188,17 +188,26 @@ fn fmt_msg_in(args: Vec<String>) -> Result<String> {
last_char = Some(ch);
}
('q', Some('%')) => {
let arg = args.next().context("not enough arguments")?;
let arg = args.next().context(format!(
"argument missing for the placeholder at col {}",
col
))?;
msg.push_str(&json::to_string(&arg)?);
last_char = None;
}
('s', Some('%')) => {
let arg = args.next().context("not enough arguments")?;
let arg = args.next().context(format!(
"argument missing for the placeholder at col {}",
col
))?;
msg.push_str(&arg);
last_char = None;
}
(ch, Some('%')) => {
bail!(format!("invalid placeholder: %{}, use %s, %q or %%", ch));
bail!(format!(
"invalid placeholder (%{}) at col {}, use one of %s %q %%",
ch, col
));
}
(ch, _) => {
msg.push(ch);
@ -212,7 +221,7 @@ fn fmt_msg_in(args: Vec<String>) -> Result<String> {
}
if args.count() != 0 {
bail!("too many arguments")
bail!("too many arguments, not enough placeholders")
}
// Since we'll mostly by passing json using `-m`, and json is faster than yaml