Skip to content

Commit f0d3e7c

Browse files
committed
Rename variables to avoid confusion
Since the paths `/absolute` and `\absolute` are not absolute paths on Windows.
1 parent 9de0ae0 commit f0d3e7c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

gix-fs/tests/stack/mod.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,24 @@ fn p(s: &str) -> &Path {
3535
#[test]
3636
#[cfg(windows)]
3737
fn path_join_handling() {
38-
let absolute = p("/absolute");
38+
let looks_absolute = p("/absolute");
3939
assert!(
40-
absolute.is_relative(),
40+
looks_absolute.is_relative(),
4141
"on Windows, absolute Linux paths are considered relative (and relative to the current drive)"
4242
);
43-
let bs_absolute = p("\\absolute");
43+
let bs_looks_absolute = p("\\absolute");
4444
assert!(
45-
bs_absolute.is_relative(),
45+
bs_looks_absolute.is_relative(),
4646
"on Windows, strange single-backslash paths are relative (and relative to the current drive)"
4747
);
4848
assert_eq!(
49-
p("relative").join(absolute),
50-
absolute,
49+
p("relative").join(looks_absolute),
50+
looks_absolute,
5151
"relative + absolute = absolute - however, they kind of act like they are absolute in conjunction with relative base paths"
5252
);
5353
assert_eq!(
54-
p("relative").join(bs_absolute),
55-
bs_absolute,
54+
p("relative").join(bs_looks_absolute),
55+
bs_looks_absolute,
5656
"relative + absolute = absolute - backslashes aren't special here, and it just acts like it's absolute"
5757
);
5858

@@ -68,22 +68,22 @@ fn path_join_handling() {
6868
);
6969

7070
assert_eq!(
71-
p("\\\\?\\base").join(absolute),
71+
p("\\\\?\\base").join(looks_absolute),
7272
p("\\\\?\\base\\absolute"),
7373
"absolute1 + unix-absolute2 = joined result with backslash"
7474
);
7575
assert_eq!(
76-
p("\\\\.\\base").join(absolute),
76+
p("\\\\.\\base").join(looks_absolute),
7777
p("\\\\.\\base\\absolute"),
7878
"absolute1 + absolute2 = joined result with backslash (device namespace)"
7979
);
8080
assert_eq!(
81-
p("\\\\?\\base").join(bs_absolute),
81+
p("\\\\?\\base").join(bs_looks_absolute),
8282
p("\\\\?\\base\\absolute"),
8383
"absolute1 + absolute2 = joined result"
8484
);
8585
assert_eq!(
86-
p("\\\\.\\base").join(bs_absolute),
86+
p("\\\\.\\base").join(bs_looks_absolute),
8787
p("\\\\.\\base\\absolute"),
8888
"absolute1 + absolute2 = joined result (device namespace)"
8989
);

0 commit comments

Comments
 (0)