Skip to content

Commit 7b17da6

Browse files
EliahKaganEliahKagan
authored
Merge pull request #1907 from EliahKagan/run-ci/raw
Use more raw string literals for clarity + minor cleanup
2 parents 75f6add + 66a5ae1 commit 7b17da6

File tree

82 files changed

+222
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+222
-219
lines changed

‎build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::process::Command;
22

33
fn main() {
44
let version = Command::new(if cfg!(windows) { "git.exe" } else { "git" })
5-
.args(["describe", "--match=v*\\.*\\.*"])
5+
.args(["describe", r"--match=v*\.*\.*"])
66
.output()
77
.ok()
88
.and_then(|out| parse_describe(&out.stdout))

‎gix-actor/src/signature/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pub(crate) mod write {
8282
#[derive(Debug, thiserror::Error)]
8383
#[allow(missing_docs)]
8484
pub(crate) enum Error {
85-
#[error("Signature name or email must not contain '<', '>' or \\n")]
85+
#[error(r"Signature name or email must not contain '<', '>' or \n")]
8686
IllegalCharacter,
8787
}
8888

‎gix-actor/tests/identity/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn lenient_parsing() -> gix_testtools::Result {
3434
let err = signature.write_to(&mut output).unwrap_err();
3535
assert_eq!(
3636
err.to_string(),
37-
"Signature name or email must not contain '<', '>' or \\n",
37+
r"Signature name or email must not contain '<', '>' or \n",
3838
"this isn't roundtrippable as the name is technically incorrect - must not contain brackets"
3939
);
4040
}

‎gix-attributes/src/parse.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mod error {
2020
#[derive(thiserror::Error, Debug)]
2121
#[allow(missing_docs)]
2222
pub enum Error {
23-
#[error("Line {line_number} has a negative pattern, for literal characters use \\!: {line}")]
23+
#[error(r"Line {line_number} has a negative pattern, for literal characters use \!: {line}")]
2424
PatternNegation { line_number: usize, line: BString },
2525
#[error("Attribute in line {line_number} has non-ascii characters or starts with '-': {attribute}")]
2626
AttributeName { line_number: usize, attribute: BString },

‎gix-attributes/tests/parse/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ fn exclamation_marks_must_be_escaped_or_error_unlike_gitignore() {
117117

118118
#[test]
119119
fn invalid_escapes_in_quotes_are_an_error() {
120-
assert!(matches!(try_line(r#""\!hello""#), Err(parse::Error::Unquote(_)),),);
120+
assert!(matches!(try_line(r#""\!hello""#), Err(parse::Error::Unquote(_))));
121121
assert!(lenient_lines(r#""\!hello""#).is_empty());
122122
}
123123

‎gix-command/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,10 @@ mod prepare {
290290
prep.command = gix_path::from_bstring(gix_quote::single(command)).into();
291291
}
292292
}
293-
prep.command.push(" \"$@\"");
293+
prep.command.push(r#" "$@""#);
294294
} else {
295295
gix_trace::debug!(
296-
"Will not add '\"$@\"' to '{:?}' as it seems to contain '$@' already",
296+
r#"Will not add '"$@"' to '{:?}' as it seems to contain '$@' already"#,
297297
prep.command
298298
);
299299
}
@@ -434,7 +434,7 @@ pub mod shebang {
434434
let mut line = buf.lines().next()?;
435435
line = line.strip_prefix(b"#!")?;
436436

437-
let slash_idx = line.rfind_byteset(b"/\\")?;
437+
let slash_idx = line.rfind_byteset(br"/\")?;
438438
Some(match line[slash_idx..].find_byte(b' ') {
439439
Some(space_idx) => {
440440
let space = slash_idx + space_idx;

‎gix-command/tests/command.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ mod shebang {
5252
"trimming works for tabs as well"
5353
);
5454
assert_eq!(
55-
parse("#!\\bin\\sh"),
56-
exe("\\bin\\sh"),
55+
parse(r"#!\bin\sh"),
56+
exe(r"\bin\sh"),
5757
"backslashes are recognized as path separator"
5858
);
5959
assert_eq!(
6060
parse("#!C:\\Program Files\\shell.exe\r\nsome stuff"),
61-
exe("C:\\Program Files\\shell.exe"),
61+
exe(r"C:\Program Files\shell.exe"),
6262
"absolute windows paths are fine"
6363
);
6464
assert_eq!(
@@ -192,8 +192,8 @@ mod context {
192192
#[test]
193193
fn glob_pathspecs_sets_env_only() {
194194
for (value, expected) in [
195-
(false, "GIT_NOGLOB_PATHSPECS=\"1\""),
196-
(true, "GIT_GLOB_PATHSPECS=\"1\""),
195+
(false, r#"GIT_NOGLOB_PATHSPECS="1""#),
196+
(true, r#"GIT_GLOB_PATHSPECS="1""#),
197197
] {
198198
let ctx = Context {
199199
glob_pathspecs: Some(value),
@@ -305,7 +305,7 @@ mod prepare {
305305
#[test]
306306
fn single_and_complex_arguments_as_part_of_command_with_shell() {
307307
let cmd = std::process::Command::from(
308-
gix_command::prepare("ls --foo \"a b\"")
308+
gix_command::prepare(r#"ls --foo "a b""#)
309309
.arg("additional")
310310
.command_may_be_shell_script(),
311311
);
@@ -324,7 +324,7 @@ mod prepare {
324324
#[test]
325325
fn single_and_complex_arguments_with_auto_split() {
326326
let cmd = std::process::Command::from(
327-
gix_command::prepare("ls --foo=\"a b\"").command_may_be_shell_script_allow_manual_argument_splitting(),
327+
gix_command::prepare(r#"ls --foo="a b""#).command_may_be_shell_script_allow_manual_argument_splitting(),
328328
);
329329
assert_eq!(
330330
format!("{cmd:?}"),
@@ -336,7 +336,7 @@ mod prepare {
336336
#[test]
337337
fn single_and_complex_arguments_without_auto_split() {
338338
let cmd = std::process::Command::from(
339-
gix_command::prepare("ls --foo=\"a b\"").command_may_be_shell_script_disallow_manual_argument_splitting(),
339+
gix_command::prepare(r#"ls --foo="a b""#).command_may_be_shell_script_disallow_manual_argument_splitting(),
340340
);
341341
assert_eq!(format!("{cmd:?}"), quoted(&[*SH, "-c", r#"ls --foo=\"a b\""#, "--"]));
342342
}
@@ -351,7 +351,7 @@ mod prepare {
351351
);
352352
assert_eq!(
353353
format!("{cmd:?}"),
354-
quoted(&[*SH, "-c", "ls \\\"$@\\\"", "--", "--foo=a b"])
354+
quoted(&[*SH, "-c", r#"ls \"$@\""#, "--", "--foo=a b"])
355355
);
356356
}
357357

@@ -366,15 +366,15 @@ mod prepare {
366366
);
367367
assert_eq!(
368368
format!("{cmd:?}"),
369-
quoted(&[*SH, "-c", "\\'ls\\' \\\"$@\\\"", "--", "--foo=a b"]),
369+
quoted(&[*SH, "-c", r#"\'ls\' \"$@\""#, "--", "--foo=a b"]),
370370
"looks strange thanks to debug printing, but is the right amount of quotes actually"
371371
);
372372
}
373373

374374
#[test]
375375
fn quoted_windows_command_without_argument_splitting() {
376376
let cmd = std::process::Command::from(
377-
gix_command::prepare("C:\\Users\\O'Shaughnessy\\with space.exe")
377+
gix_command::prepare(r"C:\Users\O'Shaughnessy\with space.exe")
378378
.arg("--foo='a b'")
379379
.command_may_be_shell_script_disallow_manual_argument_splitting()
380380
.with_shell()
@@ -385,9 +385,9 @@ mod prepare {
385385
quoted(&[
386386
*SH,
387387
"-c",
388-
"\\'C:\\\\Users\\\\O\\'\\\\\\'\\'Shaughnessy\\\\with space.exe\\' \\\"$@\\\"",
388+
r#"\'C:\\Users\\O\'\\\'\'Shaughnessy\\with space.exe\' \"$@\""#,
389389
"--",
390-
"--foo=\\'a b\\'"
390+
r"--foo=\'a b\'"
391391
]),
392392
"again, a lot of extra backslashes, but it's correct outside of the debug formatting"
393393
);
@@ -409,7 +409,7 @@ mod prepare {
409409
#[test]
410410
fn tilde_path_and_multiple_arguments_as_part_of_command_with_shell() {
411411
let cmd =
412-
std::process::Command::from(gix_command::prepare("~/bin/exe --foo \"a b\"").command_may_be_shell_script());
412+
std::process::Command::from(gix_command::prepare(r#"~/bin/exe --foo "a b""#).command_may_be_shell_script());
413413
let sh = *SH;
414414
assert_eq!(
415415
format!("{cmd:?}"),
@@ -421,7 +421,7 @@ mod prepare {
421421
#[test]
422422
fn script_with_dollar_at() {
423423
let cmd = std::process::Command::from(
424-
gix_command::prepare("echo \"$@\" >&2")
424+
gix_command::prepare(r#"echo "$@" >&2"#)
425425
.command_may_be_shell_script()
426426
.arg("store"),
427427
);
@@ -437,7 +437,7 @@ mod prepare {
437437
#[test]
438438
fn script_with_dollar_at_has_no_quoting() {
439439
let cmd = std::process::Command::from(
440-
gix_command::prepare("echo \"$@\" >&2")
440+
gix_command::prepare(r#"echo "$@" >&2"#)
441441
.command_may_be_shell_script()
442442
.with_quoted_command()
443443
.arg("store"),
@@ -487,7 +487,7 @@ mod spawn {
487487
#[test]
488488
fn script_with_dollar_at() -> crate::Result {
489489
let out = std::process::Command::from(
490-
gix_command::prepare("echo \"$@\"")
490+
gix_command::prepare(r#"echo "$@""#)
491491
.command_may_be_shell_script()
492492
.arg("arg"),
493493
)

‎gix-config-value/tests/value/path.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ mod interpolate {
1010

1111
#[test]
1212
fn backslash_is_not_special_and_they_are_not_escaping_anything() -> crate::Result {
13-
for path in ["C:\\foo\\bar", "/foo/bar"] {
13+
for path in [r"C:\foo\bar", "/foo/bar"] {
1414
let actual = gix_config_value::Path::from(Cow::Borrowed(b(path))).interpolate(Default::default())?;
1515
assert_eq!(actual, Path::new(path));
1616
assert!(
@@ -31,8 +31,8 @@ mod interpolate {
3131

3232
#[test]
3333
fn prefix_substitutes_git_install_dir() {
34-
for git_install_dir in &["/tmp/git", "C:\\git"] {
35-
for (val, expected) in &[("%(prefix)/foo/bar", "foo/bar"), ("%(prefix)/foo\\bar", "foo\\bar")] {
34+
for git_install_dir in &["/tmp/git", r"C:\git"] {
35+
for (val, expected) in &[("%(prefix)/foo/bar", "foo/bar"), (r"%(prefix)/foo\bar", r"foo\bar")] {
3636
let expected =
3737
std::path::PathBuf::from(format!("{}{}{}", git_install_dir, std::path::MAIN_SEPARATOR, expected));
3838
assert_eq!(
@@ -103,7 +103,7 @@ mod interpolate {
103103
fn tilde_with_given_user() -> crate::Result {
104104
let home = std::env::current_dir()?;
105105

106-
for path_suffix in &["foo/bar", "foo\\bar", ""] {
106+
for path_suffix in &["foo/bar", r"foo\bar", ""] {
107107
let path = format!("~user{}{}", std::path::MAIN_SEPARATOR, path_suffix);
108108
let expected = home.join("user").join(path_suffix);
109109

‎gix-config/src/file/mutable/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ fn escape_value(value: &BStr) -> BString {
2323

2424
for b in value.iter().copied() {
2525
match b {
26-
b'\n' => buf.push_str("\\n"),
27-
b'\t' => buf.push_str("\\t"),
28-
b'"' => buf.push_str("\\\""),
29-
b'\\' => buf.push_str("\\\\"),
26+
b'\n' => buf.push_str(r"\n"),
27+
b'\t' => buf.push_str(r"\t"),
28+
b'"' => buf.push_str(r#"\""#),
29+
b'\\' => buf.push_str(r"\\"),
3030
_ => buf.push(b),
3131
}
3232
}

‎gix-config/src/parse/event.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl Event<'_> {
3737
match self {
3838
Self::ValueNotDone(e) => {
3939
out.write_all(e.as_ref())?;
40-
out.write_all(b"\\")
40+
out.write_all(br"\")
4141
}
4242
Self::Whitespace(e) | Self::Newline(e) | Self::Value(e) | Self::ValueDone(e) => out.write_all(e.as_ref()),
4343
Self::KeyValueSeparator => out.write_all(b"="),

0 commit comments

Comments
 (0)