From 5399f4957234883e543047bc4cc582f4b4b887e7 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 29 Sep 2022 08:54:03 -0500 Subject: [PATCH] fix(error): Quote literals consistently --- examples/derive_ref/interop_tests.md | 8 ++++---- src/error/format.rs | 10 +++++----- tests/builder/flags.rs | 4 ++-- tests/builder/opts.rs | 4 ++-- tests/builder/subcommands.rs | 6 +++--- tests/ui/error_stderr.toml | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/derive_ref/interop_tests.md b/examples/derive_ref/interop_tests.md index df2b0d259da..2645a61522c 100644 --- a/examples/derive_ref/interop_tests.md +++ b/examples/derive_ref/interop_tests.md @@ -37,7 +37,7 @@ $ interop_augment_args --unknown ? failed error: Found argument '--unknown' which wasn't expected, or isn't valid in this context - If you tried to supply `--unknown` as a value rather than a flag, use `-- --unknown` + If you tried to supply '--unknown' as a value rather than a flag, use '-- --unknown' Usage: interop_augment_args[EXE] [OPTIONS] @@ -74,7 +74,7 @@ $ interop_augment_subcommands derived --unknown ? failed error: Found argument '--unknown' which wasn't expected, or isn't valid in this context - If you tried to supply `--unknown` as a value rather than a flag, use `-- --unknown` + If you tried to supply '--unknown' as a value rather than a flag, use '-- --unknown' Usage: interop_augment_subcommands[EXE] derived [OPTIONS] @@ -146,7 +146,7 @@ $ interop_hand_subcommand add --unknown ? failed error: Found argument '--unknown' which wasn't expected, or isn't valid in this context - If you tried to supply `--unknown` as a value rather than a flag, use `-- --unknown` + If you tried to supply '--unknown' as a value rather than a flag, use '-- --unknown' Usage: interop_hand_subcommand[EXE] add [NAME]... @@ -245,7 +245,7 @@ $ interop_flatten_hand_args --unknown ? failed error: Found argument '--unknown' which wasn't expected, or isn't valid in this context - If you tried to supply `--unknown` as a value rather than a flag, use `-- --unknown` + If you tried to supply '--unknown' as a value rather than a flag, use '-- --unknown' Usage: interop_flatten_hand_args[EXE] [OPTIONS] diff --git a/src/error/format.rs b/src/error/format.rs index f16d736aa64..eec7867c561 100644 --- a/src/error/format.rs +++ b/src/error/format.rs @@ -357,21 +357,21 @@ fn write_dynamic_context(error: &crate::error::Error, styled: &mut StyledStr) -> if invalid_arg.starts_with('-') { styled.none("\n\n"); styled.none(TAB); - styled.none("If you tried to supply `"); + styled.none("If you tried to supply '"); styled.warning(invalid_arg); - styled.none("` as a value rather than a flag, use `"); + styled.none("' as a value rather than a flag, use '"); styled.good("-- "); styled.good(invalid_arg); - styled.none("`"); + styled.none("'"); } let trailing_arg = error.get(ContextKind::TrailingArg); if trailing_arg == Some(&ContextValue::Bool(true)) { styled.none("\n\n"); styled.none(TAB); - styled.none("If you tried to supply `"); + styled.none("If you tried to supply '"); styled.warning(invalid_arg); - styled.none("` as a subcommand, remove the '"); + styled.none("' as a subcommand, remove the '"); styled.warning("--"); styled.none("' before it."); } diff --git a/tests/builder/flags.rs b/tests/builder/flags.rs index 50ba789a4f3..05804410d3c 100644 --- a/tests/builder/flags.rs +++ b/tests/builder/flags.rs @@ -160,7 +160,7 @@ fn issue_1284_argument_in_flag_style() { const USE_FLAG_AS_ARGUMENT: &str = "\ error: Found argument '--another-flag' which wasn't expected, or isn't valid in this context - If you tried to supply `--another-flag` as a value rather than a flag, use `-- --another-flag` + If you tried to supply '--another-flag' as a value rather than a flag, use '-- --another-flag' Usage: mycat [OPTIONS] [filename] @@ -204,7 +204,7 @@ fn issue_2308_multiple_dashes() { static MULTIPLE_DASHES: &str = "\ error: Found argument '-----' which wasn't expected, or isn't valid in this context - If you tried to supply `-----` as a value rather than a flag, use `-- -----` + If you tried to supply '-----' as a value rather than a flag, use '-- -----' Usage: test diff --git a/tests/builder/opts.rs b/tests/builder/opts.rs index 2771306f038..86258e26989 100644 --- a/tests/builder/opts.rs +++ b/tests/builder/opts.rs @@ -451,7 +451,7 @@ error: Found argument '--optio' which wasn't expected, or isn't valid in this co Did you mean '--option'? - If you tried to supply `--optio` as a value rather than a flag, use `-- --optio` + If you tried to supply '--optio' as a value rather than a flag, use '-- --optio' Usage: clap-test --option ... [positional] [positional2] [positional3]... @@ -551,7 +551,7 @@ error: Found argument '--files-without-matches' which wasn't expected, or isn't Did you mean '--files-without-match'? - If you tried to supply `--files-without-matches` as a value rather than a flag, use `-- --files-without-matches` + If you tried to supply '--files-without-matches' as a value rather than a flag, use '-- --files-without-matches' Usage: ripgrep-616 --files-without-match diff --git a/tests/builder/subcommands.rs b/tests/builder/subcommands.rs index 1dbdf0bd6ed..509f3dfc234 100644 --- a/tests/builder/subcommands.rs +++ b/tests/builder/subcommands.rs @@ -145,7 +145,7 @@ error: Found argument '--subcmarg' which wasn't expected, or isn't valid in this Did you mean to put '--subcmdarg' after the subcommand 'subcmd'? - If you tried to supply `--subcmarg` as a value rather than a flag, use `-- --subcmarg` + If you tried to supply '--subcmarg' as a value rather than a flag, use '-- --subcmarg' Usage: dym [COMMAND] @@ -165,7 +165,7 @@ fn subcmd_did_you_mean_output_arg_false_positives() { static EXPECTED: &str = "\ error: Found argument '--subcmarg' which wasn't expected, or isn't valid in this context - If you tried to supply `--subcmarg` as a value rather than a flag, use `-- --subcmarg` + If you tried to supply '--subcmarg' as a value rather than a flag, use '-- --subcmarg' Usage: dym [COMMAND] @@ -359,7 +359,7 @@ fn subcommand_used_after_double_dash() { static SUBCMD_AFTER_DOUBLE_DASH: &str = "\ error: Found argument 'subcmd' which wasn't expected, or isn't valid in this context - If you tried to supply `subcmd` as a subcommand, remove the '--' before it. + If you tried to supply 'subcmd' as a subcommand, remove the '--' before it. Usage: cmd [COMMAND] diff --git a/tests/ui/error_stderr.toml b/tests/ui/error_stderr.toml index 364984de8e4..80f46113b33 100644 --- a/tests/ui/error_stderr.toml +++ b/tests/ui/error_stderr.toml @@ -5,7 +5,7 @@ stdout = "" stderr = """ error: Found argument '--unknown-argument' which wasn't expected, or isn't valid in this context - If you tried to supply `--unknown-argument` as a value rather than a flag, use `-- --unknown-argument` + If you tried to supply '--unknown-argument' as a value rather than a flag, use '-- --unknown-argument' Usage: stdio-fixture[EXE] [OPTIONS] [COMMAND]