Skip to content

Commit 579417d

Browse files
lilyballlilyball
committed
---
yaml --- r: 81615 b: refs/heads/snap-stage3 c: b8af653 h: refs/heads/master i: 81613: b58a8fa 81611: 1adf485 81607: d7e359d 81599: c5d02f1 v: v3
1 parent 029e1ae commit 579417d

File tree

4 files changed

+37
-32
lines changed

4 files changed

+37
-32
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 73d3d00ec437f87ac665b4e4da3bedec8ce4f9ef
4+
refs/heads/snap-stage3: b8af6539844a7edead3220f088248f8020793a0d
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/src/libstd/path/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,6 +1089,6 @@ mod tests {
10891089

10901090
let input = "\\foo\\bar\\baz";
10911091
let path: WindowsPath = GenericPath::from_c_str(input.to_c_str());
1092-
assert_eq!(path.as_str().unwrap(), input);
1092+
assert_eq!(path.as_str().unwrap(), input.as_slice());
10931093
}
10941094
}

‎branches/snap-stage3/src/libstd/path/posix.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1311,19 +1311,19 @@ mod tests {
13111311
let path = $path;
13121312
let filename = $filename;
13131313
assert!(path.filename_str() == filename,
1314-
"`%s`.filename_str(): Expected `%?`, found `%?`",
1314+
"{}.filename_str(): Expected `{:?}`, found {:?}",
13151315
path.as_str().unwrap(), filename, path.filename_str());
13161316
let dirname = $dirname;
13171317
assert!(path.dirname_str() == dirname,
1318-
"`%s`.dirname_str(): Expected `%?`, found `%?`",
1318+
"`{}`.dirname_str(): Expected `{:?}`, found `{:?}`",
13191319
path.as_str().unwrap(), dirname, path.dirname_str());
13201320
let filestem = $filestem;
13211321
assert!(path.filestem_str() == filestem,
1322-
"`%s`.filestem_str(): Expected `%?`, found `%?`",
1322+
"`{}`.filestem_str(): Expected `{:?}`, found `{:?}`",
13231323
path.as_str().unwrap(), filestem, path.filestem_str());
13241324
let ext = $ext;
13251325
assert!(path.extension_str() == ext,
1326-
"`%s`.extension_str(): Expected `%?`, found `%?`",
1326+
"`{}`.extension_str(): Expected `{:?}`, found `{:?}`",
13271327
path.as_str().unwrap(), ext, path.extension_str());
13281328
}
13291329
);
@@ -1547,11 +1547,11 @@ mod tests {
15471547
let comps = path.component_iter().to_owned_vec();
15481548
let exp: &[&str] = $exp;
15491549
let exps = exp.iter().map(|x| x.as_bytes()).to_owned_vec();
1550-
assert!(comps == exps, "component_iter: Expected %?, found %?",
1550+
assert!(comps == exps, "component_iter: Expected {:?}, found {:?}",
15511551
comps, exps);
15521552
let comps = path.rev_component_iter().to_owned_vec();
15531553
let exps = exps.move_rev_iter().to_owned_vec();
1554-
assert!(comps == exps, "rev_component_iter: Expected %?, found %?",
1554+
assert!(comps == exps, "rev_component_iter: Expected {:?}, found {:?}",
15551555
comps, exps);
15561556
}
15571557
);
@@ -1560,11 +1560,12 @@ mod tests {
15601560
let path = Path::from_vec(b!($($arg),+));
15611561
let comps = path.component_iter().to_owned_vec();
15621562
let exp: &[&[u8]] = [$(b!($($exp),*)),*];
1563-
assert!(comps.as_slice() == exp, "component_iter: Expected %?, found %?",
1563+
assert!(comps.as_slice() == exp, "component_iter: Expected {:?}, found {:?}",
15641564
comps.as_slice(), exp);
15651565
let comps = path.rev_component_iter().to_owned_vec();
15661566
let exp = exp.rev_iter().map(|&x|x).to_owned_vec();
1567-
assert!(comps.as_slice() == exp, "rev_component_iter: Expected %?, found %?",
1567+
assert!(comps.as_slice() == exp,
1568+
"rev_component_iter: Expected {:?}, found {:?}",
15681569
comps.as_slice(), exp);
15691570
}
15701571
)
@@ -1594,12 +1595,13 @@ mod tests {
15941595
let path = Path::from_vec(b!($($arg),+));
15951596
let comps = path.str_component_iter().to_owned_vec();
15961597
let exp: &[Option<&str>] = $exp;
1597-
assert!(comps.as_slice() == exp, "str_component_iter: Expected %?, found %?",
1598+
assert!(comps.as_slice() == exp,
1599+
"str_component_iter: Expected {:?}, found {:?}",
15981600
comps.as_slice(), exp);
15991601
let comps = path.rev_str_component_iter().to_owned_vec();
16001602
let exp = exp.rev_iter().map(|&x|x).to_owned_vec();
16011603
assert!(comps.as_slice() == exp,
1602-
"rev_str_component_iter: Expected %?, found %?",
1604+
"rev_str_component_iter: Expected {:?}, found {:?}",
16031605
comps.as_slice(), exp);
16041606
}
16051607
)

‎branches/snap-stage3/src/libstd/path/windows.rs

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ mod tests {
12631263
let exp = $exp;
12641264
let res = parse_prefix(path);
12651265
assert!(res == exp,
1266-
"parse_prefix(\"%s\"): expected %?, found %?", path, exp, res);
1266+
"parse_prefix(\"{}\"): expected {:?}, found {:?}", path, exp, res);
12671267
}
12681268
)
12691269
)
@@ -1809,11 +1809,11 @@ mod tests {
18091809
let file = p.pop_str();
18101810
let left = $left;
18111811
assert!(p.as_str() == Some(left),
1812-
"`%s`.pop() failed; expected remainder `%s`, found `%s`",
1812+
"`{}`.pop() failed; expected remainder `{}`, found `{}`",
18131813
pstr, left, p.as_str().unwrap());
18141814
let right = $right;
18151815
let res = file.map(|s| s.as_slice());
1816-
assert!(res == right, "`%s`.pop() failed; expected `%?`, found `%?`",
1816+
assert!(res == right, "`{}`.pop() failed; expected `{:?}`, found `{:?}`",
18171817
pstr, right, res);
18181818
}
18191819
);
@@ -1965,7 +1965,7 @@ mod tests {
19651965
let res = path.$op(arg);
19661966
let exp = $res;
19671967
assert!(res.as_str() == Some(exp),
1968-
"`%s`.%s(\"%s\"): Expected `%s`, found `%s`",
1968+
"`{}`.{}(\"{}\"): Expected `{}`, found `{}`",
19691969
pstr, stringify!($op), arg, exp, res.as_str().unwrap());
19701970
}
19711971
)
@@ -2201,19 +2201,19 @@ mod tests {
22012201
let path = $path;
22022202
let filename = $filename;
22032203
assert!(path.filename_str() == filename,
2204-
"`%s`.filename_str(): Expected `%?`, found `%?`",
2204+
"`{}`.filename_str(): Expected `{:?}`, found `{:?}`",
22052205
path.as_str().unwrap(), filename, path.filename_str());
22062206
let dirname = $dirname;
22072207
assert!(path.dirname_str() == dirname,
2208-
"`%s`.dirname_str(): Expected `%?`, found `%?`",
2208+
"`{}`.dirname_str(): Expected `{:?}`, found `{:?}`",
22092209
path.as_str().unwrap(), dirname, path.dirname_str());
22102210
let filestem = $filestem;
22112211
assert!(path.filestem_str() == filestem,
2212-
"`%s`.filestem_str(): Expected `%?`, found `%?`",
2212+
"`{}`.filestem_str(): Expected `{:?}`, found `{:?}`",
22132213
path.as_str().unwrap(), filestem, path.filestem_str());
22142214
let ext = $ext;
22152215
assert!(path.extension_str() == ext,
2216-
"`%s`.extension_str(): Expected `%?`, found `%?`",
2216+
"`{}`.extension_str(): Expected `{:?}`, found `{:?}`",
22172217
path.as_str().unwrap(), ext, path.extension_str());
22182218
}
22192219
);
@@ -2284,16 +2284,16 @@ mod tests {
22842284
let path = Path::from_str($path);
22852285
let (abs, vol, cwd, rel) = ($abs, $vol, $cwd, $rel);
22862286
let b = path.is_absolute();
2287-
assert!(b == abs, "Path '%s'.is_absolute(): expected %?, found %?",
2287+
assert!(b == abs, "Path '{}'.is_absolute(): expected {:?}, found {:?}",
22882288
path.as_str().unwrap(), abs, b);
22892289
let b = path.is_vol_relative();
2290-
assert!(b == vol, "Path '%s'.is_vol_relative(): expected %?, found %?",
2290+
assert!(b == vol, "Path '{}'.is_vol_relative(): expected {:?}, found {:?}",
22912291
path.as_str().unwrap(), vol, b);
22922292
let b = path.is_cwd_relative();
2293-
assert!(b == cwd, "Path '%s'.is_cwd_relative(): expected %?, found %?",
2293+
assert!(b == cwd, "Path '{}'.is_cwd_relative(): expected {:?}, found {:?}",
22942294
path.as_str().unwrap(), cwd, b);
22952295
let b = path.is_relative();
2296-
assert!(b == rel, "Path '%s'.is_relativf(): expected %?, found %?",
2296+
assert!(b == rel, "Path '{}'.is_relativf(): expected {:?}, found {:?}",
22972297
path.as_str().unwrap(), rel, b);
22982298
}
22992299
)
@@ -2326,7 +2326,7 @@ mod tests {
23262326
let exp = $exp;
23272327
let res = path.is_ancestor_of(&dest);
23282328
assert!(res == exp,
2329-
"`%s`.is_ancestor_of(`%s`): Expected %?, found %?",
2329+
"`{}`.is_ancestor_of(`{}`): Expected {:?}, found {:?}",
23302330
path.as_str().unwrap(), dest.as_str().unwrap(), exp, res);
23312331
}
23322332
)
@@ -2461,7 +2461,7 @@ mod tests {
24612461
let res = path.path_relative_from(&other);
24622462
let exp = $exp;
24632463
assert!(res.and_then_ref(|x| x.as_str()) == exp,
2464-
"`%s`.path_relative_from(`%s`): Expected %?, got %?",
2464+
"`{}`.path_relative_from(`{}`): Expected {:?}, got {:?}",
24652465
path.as_str().unwrap(), other.as_str().unwrap(), exp,
24662466
res.and_then_ref(|x| x.as_str()));
24672467
}
@@ -2593,12 +2593,13 @@ mod tests {
25932593
let path = Path::from_str($path);
25942594
let comps = path.str_component_iter().map(|x|x.unwrap()).to_owned_vec();
25952595
let exp: &[&str] = $exp;
2596-
assert!(comps.as_slice() == exp, "str_component_iter: Expected %?, found %?",
2596+
assert!(comps.as_slice() == exp,
2597+
"str_component_iter: Expected {:?}, found {:?}",
25972598
comps.as_slice(), exp);
25982599
let comps = path.rev_str_component_iter().map(|x|x.unwrap()).to_owned_vec();
25992600
let exp = exp.rev_iter().map(|&x|x).to_owned_vec();
26002601
assert!(comps.as_slice() == exp,
2601-
"rev_str_component_iter: Expected %?, found %?",
2602+
"rev_str_component_iter: Expected {:?}, found {:?}",
26022603
comps.as_slice(), exp);
26032604
}
26042605
);
@@ -2607,12 +2608,13 @@ mod tests {
26072608
let path = Path::from_vec(b!($($arg),+));
26082609
let comps = path.str_component_iter().map(|x|x.unwrap()).to_owned_vec();
26092610
let exp: &[&str] = $exp;
2610-
assert!(comps.as_slice() == exp, "str_component_iter: Expected %?, found %?",
2611+
assert!(comps.as_slice() == exp,
2612+
"str_component_iter: Expected {:?}, found {:?}",
26112613
comps.as_slice(), exp);
26122614
let comps = path.rev_str_component_iter().map(|x|x.unwrap()).to_owned_vec();
26132615
let exp = exp.rev_iter().map(|&x|x).to_owned_vec();
26142616
assert!(comps.as_slice() == exp,
2615-
"rev_str_component_iter: Expected %?, found %?",
2617+
"rev_str_component_iter: Expected {:?}, found {:?}",
26162618
comps.as_slice(), exp);
26172619
}
26182620
)
@@ -2666,11 +2668,12 @@ mod tests {
26662668
let path = Path::from_str($path);
26672669
let comps = path.component_iter().to_owned_vec();
26682670
let exp: &[&[u8]] = $exp;
2669-
assert!(comps.as_slice() == exp, "component_iter: Expected %?, found %?",
2671+
assert!(comps.as_slice() == exp, "component_iter: Expected {:?}, found {:?}",
26702672
comps.as_slice(), exp);
26712673
let comps = path.rev_component_iter().to_owned_vec();
26722674
let exp = exp.rev_iter().map(|&x|x).to_owned_vec();
2673-
assert!(comps.as_slice() == exp, "rev_component_iter: Expected %?, found %?",
2675+
assert!(comps.as_slice() == exp,
2676+
"rev_component_iter: Expected {:?}, found {:?}",
26742677
comps.as_slice(), exp);
26752678
}
26762679
)

0 commit comments

Comments
 (0)