Skip to content

Commit eac635d

Browse files
author
Jorge Aparicio
committed
Remove unused transmutes from tests
1 parent b32b24d commit eac635d

File tree

2 files changed

+78
-100
lines changed

2 files changed

+78
-100
lines changed

‎src/libstd/path/posix.rs

+41-52
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,6 @@ static dot_dot_static: &'static [u8] = b"..";
443443
mod tests {
444444
use prelude::*;
445445
use super::*;
446-
use mem;
447446
use str;
448447
use str::StrPrelude;
449448

@@ -601,10 +600,8 @@ mod tests {
601600
macro_rules! t(
602601
(s: $path:expr, $op:ident, $exp:expr) => (
603602
{
604-
unsafe {
605-
let path = Path::new($path);
606-
assert!(path.$op() == mem::transmute(($exp).as_bytes()));
607-
}
603+
let path = Path::new($path);
604+
assert!(path.$op() == ($exp).as_bytes());
608605
}
609606
);
610607
(s: $path:expr, $op:ident, $exp:expr, opt) => (
@@ -616,11 +613,9 @@ mod tests {
616613
);
617614
(v: $path:expr, $op:ident, $exp:expr) => (
618615
{
619-
unsafe {
620-
let arg = $path;
621-
let path = Path::new(arg);
622-
assert!(path.$op() == mem::transmute($exp));
623-
}
616+
let arg = $path;
617+
let path = Path::new(arg);
618+
assert!(path.$op() == $exp);
624619
}
625620
);
626621
)
@@ -668,9 +663,8 @@ mod tests {
668663
t!(v: b"hi/there.txt", extension, Some(b"txt"));
669664
t!(v: b"hi/there\x80.txt", extension, Some(b"txt"));
670665
t!(v: b"hi/there.t\x80xt", extension, Some(b"t\x80xt"));
671-
let no: Option<&'static [u8]> = None;
672-
t!(v: b"hi/there", extension, no);
673-
t!(v: b"hi/there\x80", extension, no);
666+
t!(v: b"hi/there", extension, None);
667+
t!(v: b"hi/there\x80", extension, None);
674668
t!(s: "hi/there.txt", extension, Some("txt"), opt);
675669
t!(s: "hi/there", extension, None, opt);
676670
t!(s: "there.txt", extension, Some("txt"), opt);
@@ -959,62 +953,57 @@ mod tests {
959953
macro_rules! t(
960954
(s: $path:expr, $filename:expr, $dirname:expr, $filestem:expr, $ext:expr) => (
961955
{
962-
unsafe {
963-
let path = $path;
964-
let filename = $filename;
965-
assert!(path.filename_str() == filename,
966-
"{}.filename_str(): Expected `{}`, found {}",
967-
path.as_str().unwrap(), filename, path.filename_str());
968-
let dirname = $dirname;
969-
assert!(path.dirname_str() == dirname,
970-
"`{}`.dirname_str(): Expected `{}`, found `{}`",
971-
path.as_str().unwrap(), dirname, path.dirname_str());
972-
let filestem = $filestem;
973-
assert!(path.filestem_str() == filestem,
974-
"`{}`.filestem_str(): Expected `{}`, found `{}`",
975-
path.as_str().unwrap(), filestem, path.filestem_str());
976-
let ext = $ext;
977-
assert!(path.extension_str() == mem::transmute(ext),
978-
"`{}`.extension_str(): Expected `{}`, found `{}`",
979-
path.as_str().unwrap(), ext, path.extension_str());
980-
}
956+
let path = $path;
957+
let filename = $filename;
958+
assert!(path.filename_str() == filename,
959+
"{}.filename_str(): Expected `{}`, found {}",
960+
path.as_str().unwrap(), filename, path.filename_str());
961+
let dirname = $dirname;
962+
assert!(path.dirname_str() == dirname,
963+
"`{}`.dirname_str(): Expected `{}`, found `{}`",
964+
path.as_str().unwrap(), dirname, path.dirname_str());
965+
let filestem = $filestem;
966+
assert!(path.filestem_str() == filestem,
967+
"`{}`.filestem_str(): Expected `{}`, found `{}`",
968+
path.as_str().unwrap(), filestem, path.filestem_str());
969+
let ext = $ext;
970+
assert!(path.extension_str() == ext,
971+
"`{}`.extension_str(): Expected `{}`, found `{}`",
972+
path.as_str().unwrap(), ext, path.extension_str());
981973
}
982974
);
983975
(v: $path:expr, $filename:expr, $dirname:expr, $filestem:expr, $ext:expr) => (
984976
{
985-
unsafe {
986-
let path = $path;
987-
assert!(path.filename() == mem::transmute($filename));
988-
assert!(path.dirname() == mem::transmute($dirname));
989-
assert!(path.filestem() == mem::transmute($filestem));
990-
assert!(path.extension() == mem::transmute($ext));
991-
}
977+
let path = $path;
978+
assert!(path.filename() == $filename);
979+
assert!(path.dirname() == $dirname);
980+
assert!(path.filestem() == $filestem);
981+
assert!(path.extension() == $ext);
992982
}
993983
)
994984
)
995985

996-
let no: Option<&'static str> = None;
997-
t!(v: Path::new(b"a/b/c"), Some(b"c"), b"a/b", Some(b"c"), no);
998-
t!(v: Path::new(b"a/b/\xFF"), Some(b"\xFF"), b"a/b", Some(b"\xFF"), no);
986+
t!(v: Path::new(b"a/b/c"), Some(b"c"), b"a/b", Some(b"c"), None);
987+
t!(v: Path::new(b"a/b/\xFF"), Some(b"\xFF"), b"a/b", Some(b"\xFF"), None);
999988
t!(v: Path::new(b"hi/there.\xFF"), Some(b"there.\xFF"), b"hi",
1000989
Some(b"there"), Some(b"\xFF"));
1001-
t!(s: Path::new("a/b/c"), Some("c"), Some("a/b"), Some("c"), no);
1002-
t!(s: Path::new("."), None, Some("."), None, no);
1003-
t!(s: Path::new("/"), None, Some("/"), None, no);
1004-
t!(s: Path::new(".."), None, Some(".."), None, no);
1005-
t!(s: Path::new("../.."), None, Some("../.."), None, no);
990+
t!(s: Path::new("a/b/c"), Some("c"), Some("a/b"), Some("c"), None);
991+
t!(s: Path::new("."), None, Some("."), None, None);
992+
t!(s: Path::new("/"), None, Some("/"), None, None);
993+
t!(s: Path::new(".."), None, Some(".."), None, None);
994+
t!(s: Path::new("../.."), None, Some("../.."), None, None);
1006995
t!(s: Path::new("hi/there.txt"), Some("there.txt"), Some("hi"),
1007996
Some("there"), Some("txt"));
1008-
t!(s: Path::new("hi/there"), Some("there"), Some("hi"), Some("there"), no);
997+
t!(s: Path::new("hi/there"), Some("there"), Some("hi"), Some("there"), None);
1009998
t!(s: Path::new("hi/there."), Some("there."), Some("hi"),
1010999
Some("there"), Some(""));
1011-
t!(s: Path::new("hi/.there"), Some(".there"), Some("hi"), Some(".there"), no);
1000+
t!(s: Path::new("hi/.there"), Some(".there"), Some("hi"), Some(".there"), None);
10121001
t!(s: Path::new("hi/..there"), Some("..there"), Some("hi"),
10131002
Some("."), Some("there"));
1014-
t!(s: Path::new(b"a/b/\xFF"), None, Some("a/b"), None, no);
1003+
t!(s: Path::new(b"a/b/\xFF"), None, Some("a/b"), None, None);
10151004
t!(s: Path::new(b"a/b/\xFF.txt"), None, Some("a/b"), None, Some("txt"));
1016-
t!(s: Path::new(b"a/b/c.\x80"), None, Some("a/b"), Some("c"), no);
1017-
t!(s: Path::new(b"\xFF/b"), Some("b"), None, Some("b"), no);
1005+
t!(s: Path::new(b"a/b/c.\x80"), None, Some("a/b"), Some("c"), None);
1006+
t!(s: Path::new(b"\xFF/b"), Some("b"), None, Some("b"), None);
10181007
}
10191008

10201009
#[test]

‎src/libstd/path/windows.rs

+37-48
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,6 @@ fn prefix_len(p: Option<PathPrefix>) -> uint {
11151115

11161116
#[cfg(test)]
11171117
mod tests {
1118-
use mem;
11191118
use prelude::*;
11201119
use super::*;
11211120
use super::parse_prefix;
@@ -1358,11 +1357,9 @@ mod tests {
13581357
macro_rules! t(
13591358
(s: $path:expr, $op:ident, $exp:expr) => (
13601359
{
1361-
unsafe {
1362-
let path = $path;
1363-
let path = Path::new(path);
1364-
assert!(path.$op() == Some(mem::transmute($exp)));
1365-
}
1360+
let path = $path;
1361+
let path = Path::new(path);
1362+
assert!(path.$op() == Some($exp));
13661363
}
13671364
);
13681365
(s: $path:expr, $op:ident, $exp:expr, opt) => (
@@ -1375,11 +1372,9 @@ mod tests {
13751372
);
13761373
(v: $path:expr, $op:ident, $exp:expr) => (
13771374
{
1378-
unsafe {
1379-
let path = $path;
1380-
let path = Path::new(path);
1381-
assert!(path.$op() == mem::transmute($exp));
1382-
}
1375+
let path = $path;
1376+
let path = Path::new(path);
1377+
assert!(path.$op() == $exp);
13831378
}
13841379
)
13851380
)
@@ -1464,8 +1459,7 @@ mod tests {
14641459
// filestem is based on filename, so we don't need the full set of prefix tests
14651460

14661461
t!(v: b"hi\\there.txt", extension, Some(b"txt"));
1467-
let no: Option<&'static [u8]> = None;
1468-
t!(v: b"hi\\there", extension, no);
1462+
t!(v: b"hi\\there", extension, None);
14691463
t!(s: "hi\\there.txt", extension_str, Some("txt"), opt);
14701464
t!(s: "hi\\there", extension_str, None, opt);
14711465
t!(s: "there.txt", extension_str, Some("txt"), opt);
@@ -1872,53 +1866,48 @@ mod tests {
18721866
macro_rules! t(
18731867
(s: $path:expr, $filename:expr, $dirname:expr, $filestem:expr, $ext:expr) => (
18741868
{
1875-
unsafe {
1876-
let path = $path;
1877-
let filename = $filename;
1878-
assert!(path.filename_str() == filename,
1879-
"`{}`.filename_str(): Expected `{}`, found `{}`",
1880-
path.as_str().unwrap(), filename, path.filename_str());
1881-
let dirname = $dirname;
1882-
assert!(path.dirname_str() == dirname,
1883-
"`{}`.dirname_str(): Expected `{}`, found `{}`",
1884-
path.as_str().unwrap(), dirname, path.dirname_str());
1885-
let filestem = $filestem;
1886-
assert!(path.filestem_str() == filestem,
1887-
"`{}`.filestem_str(): Expected `{}`, found `{}`",
1888-
path.as_str().unwrap(), filestem, path.filestem_str());
1889-
let ext = $ext;
1890-
assert!(path.extension_str() == mem::transmute(ext),
1891-
"`{}`.extension_str(): Expected `{}`, found `{}`",
1892-
path.as_str().unwrap(), ext, path.extension_str());
1893-
}
1869+
let path = $path;
1870+
let filename = $filename;
1871+
assert!(path.filename_str() == filename,
1872+
"`{}`.filename_str(): Expected `{}`, found `{}`",
1873+
path.as_str().unwrap(), filename, path.filename_str());
1874+
let dirname = $dirname;
1875+
assert!(path.dirname_str() == dirname,
1876+
"`{}`.dirname_str(): Expected `{}`, found `{}`",
1877+
path.as_str().unwrap(), dirname, path.dirname_str());
1878+
let filestem = $filestem;
1879+
assert!(path.filestem_str() == filestem,
1880+
"`{}`.filestem_str(): Expected `{}`, found `{}`",
1881+
path.as_str().unwrap(), filestem, path.filestem_str());
1882+
let ext = $ext;
1883+
assert!(path.extension_str() == ext,
1884+
"`{}`.extension_str(): Expected `{}`, found `{}`",
1885+
path.as_str().unwrap(), ext, path.extension_str());
18941886
}
18951887
);
18961888
(v: $path:expr, $filename:expr, $dirname:expr, $filestem:expr, $ext:expr) => (
18971889
{
1898-
unsafe {
1899-
let path = $path;
1900-
assert!(path.filename() == mem::transmute($filename));
1901-
assert!(path.dirname() == mem::transmute($dirname));
1902-
assert!(path.filestem() == mem::transmute($filestem));
1903-
assert!(path.extension() == mem::transmute($ext));
1904-
}
1890+
let path = $path;
1891+
assert!(path.filename() == $filename);
1892+
assert!(path.dirname() == $dirname);
1893+
assert!(path.filestem() == $filestem);
1894+
assert!(path.extension() == $ext);
19051895
}
19061896
)
19071897
)
19081898

1909-
let no: Option<&'static str> = None;
1910-
t!(v: Path::new(b"a\\b\\c"), Some(b"c"), b"a\\b", Some(b"c"), no);
1911-
t!(s: Path::new("a\\b\\c"), Some("c"), Some("a\\b"), Some("c"), no);
1912-
t!(s: Path::new("."), None, Some("."), None, no);
1913-
t!(s: Path::new("\\"), None, Some("\\"), None, no);
1914-
t!(s: Path::new(".."), None, Some(".."), None, no);
1915-
t!(s: Path::new("..\\.."), None, Some("..\\.."), None, no);
1899+
t!(v: Path::new(b"a\\b\\c"), Some(b"c"), b"a\\b", Some(b"c"), None);
1900+
t!(s: Path::new("a\\b\\c"), Some("c"), Some("a\\b"), Some("c"), None);
1901+
t!(s: Path::new("."), None, Some("."), None, None);
1902+
t!(s: Path::new("\\"), None, Some("\\"), None, None);
1903+
t!(s: Path::new(".."), None, Some(".."), None, None);
1904+
t!(s: Path::new("..\\.."), None, Some("..\\.."), None, None);
19161905
t!(s: Path::new("hi\\there.txt"), Some("there.txt"), Some("hi"),
19171906
Some("there"), Some("txt"));
1918-
t!(s: Path::new("hi\\there"), Some("there"), Some("hi"), Some("there"), no);
1907+
t!(s: Path::new("hi\\there"), Some("there"), Some("hi"), Some("there"), None);
19191908
t!(s: Path::new("hi\\there."), Some("there."), Some("hi"),
19201909
Some("there"), Some(""));
1921-
t!(s: Path::new("hi\\.there"), Some(".there"), Some("hi"), Some(".there"), no);
1910+
t!(s: Path::new("hi\\.there"), Some(".there"), Some("hi"), Some(".there"), None);
19221911
t!(s: Path::new("hi\\..there"), Some("..there"), Some("hi"),
19231912
Some("."), Some("there"));
19241913

0 commit comments

Comments
 (0)