about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2017-01-25 17:08:17 +0100
committerGitHub <noreply@github.com>2017-01-25 17:08:17 +0100
commit66497d50f898d3f6e74a4ccdd4050d1825779c65 (patch)
tree67bb6ee10d0db51d0da9be3cae697b6fa16740d4
parentfd8988eb0b3120c6a71bb86f0c5ecec0d4ce37f0 (diff)
parent91a478ec3451f5e45f099218efb05a77bd632d86 (diff)
downloadrust-66497d50f898d3f6e74a4ccdd4050d1825779c65.tar.gz
rust-66497d50f898d3f6e74a4ccdd4050d1825779c65.zip
Rollup merge of #39251 - wesleywiser:fixme_1, r=BurntSushi
Remove a FIXME in core/hash tests

Removes a FIXME
-rw-r--r--src/libcoretest/hash/mod.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libcoretest/hash/mod.rs b/src/libcoretest/hash/mod.rs
index 4ea42644ecd..0d124338133 100644
--- a/src/libcoretest/hash/mod.rs
+++ b/src/libcoretest/hash/mod.rs
@@ -62,9 +62,8 @@ fn test_writer_hasher() {
 
     let s: &str = "a";
     assert_eq!(hash(& s), 97 + 0xFF);
-    // FIXME (#18283) Enable test
-    //let s: Box<str> = box "a";
-    //assert_eq!(hasher.hash(& s), 97 + 0xFF);
+    let s: Box<str> = String::from("a").into_boxed_str();
+    assert_eq!(hash(& s), 97 + 0xFF);
     let cs: &[u8] = &[1, 2, 3];
     assert_eq!(hash(& cs), 9);
     // FIXME (#22405): Replace `Box::new` with `box` here when/if possible.