diff options
| author | bors <bors@rust-lang.org> | 2017-01-25 17:23:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-25 17:23:54 +0000 |
| commit | fc57e40ce703cb70a39249f5cfb661020a1549b6 (patch) | |
| tree | 60c257c4000f019544f94929faf63a2fcc48e56b /src/libcoretest | |
| parent | 1283c029557bcde106adde71f467fe133b3ffeff (diff) | |
| parent | a2fa75b70546baa160be2a00326fa1b08d699b4c (diff) | |
| download | rust-fc57e40ce703cb70a39249f5cfb661020a1549b6.tar.gz rust-fc57e40ce703cb70a39249f5cfb661020a1549b6.zip | |
Auto merge of #39296 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 6 pull requests - Successful merges: #38930, #39212, #39251, #39267, #39276, #39278 - Failed merges:
Diffstat (limited to 'src/libcoretest')
| -rw-r--r-- | src/libcoretest/hash/mod.rs | 5 |
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. |