diff options
| author | bors <bors@rust-lang.org> | 2023-11-11 21:12:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-11 21:12:20 +0000 |
| commit | 2c1b65ee1431f8d3fe2142e821eb13c623bbf8a0 (patch) | |
| tree | 309f710af9b252a81b42bac06de80552453ac75d /src/tools/compiletest | |
| parent | ed086d86b8b224f7df2da09cf48ac2a654bf841e (diff) | |
| parent | 8337e86b28b9cdab7250e39710a1c81b99aeeb8d (diff) | |
| download | rust-2c1b65ee1431f8d3fe2142e821eb13c623bbf8a0.tar.gz rust-2c1b65ee1431f8d3fe2142e821eb13c623bbf8a0.zip | |
Auto merge of #115694 - clarfonthey:std-hash-private, r=dtolnay
Add `std::hash::{DefaultHasher, RandomState}` exports (needs FCP)
This implements rust-lang/libs-team#267 to move the libstd hasher types to `std::hash` where they belong, instead of `std::collections::hash_map`.
<details><summary>The below no longer applies, but is kept for clarity.</summary>
This is a small refactor for #27242, which moves the definitions of `RandomState` and `DefaultHasher` into `std::hash`, but in a way that won't be noticed in the public API.
I've opened rust-lang/libs-team#267 as a formal ACP to move these directly into the root of `std::hash`, but for now, they're at least separated out from the collections code in a way that will make moving that around easier.
I decided to simply copy the rustdoc for `std::hash` from `core::hash` since I think it would be ideal for the two to diverge longer-term, especially if the ACP is accepted. However, I would be willing to factor them out into a common markdown document if that's preferred.
</details>
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 63e8ba7c79f..8854908c430 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -20,12 +20,11 @@ use regex::{Captures, Regex}; use rustfix::{apply_suggestions, get_suggestions_from_json, Filter}; use std::borrow::Cow; -use std::collections::hash_map::DefaultHasher; use std::collections::{HashMap, HashSet}; use std::env; use std::ffi::{OsStr, OsString}; use std::fs::{self, create_dir_all, File, OpenOptions}; -use std::hash::{Hash, Hasher}; +use std::hash::{DefaultHasher, Hash, Hasher}; use std::io::prelude::*; use std::io::{self, BufReader}; use std::iter; |
