diff options
| author | bors <bors@rust-lang.org> | 2022-03-30 07:45:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-30 07:45:42 +0000 |
| commit | 05142a7e4495f09141fdd65f140fe44d8c200a9e (patch) | |
| tree | ee648c1ad529193c0420d15f5361dd6d88ad8a48 /compiler/rustc_data_structures/src | |
| parent | f132bcf3bdf6d3ff9be7d02e8d0088b99007cd5e (diff) | |
| parent | 03b3993ae87ea47cfbff30534b0567a8b4574134 (diff) | |
| download | rust-05142a7e4495f09141fdd65f140fe44d8c200a9e.tar.gz rust-05142a7e4495f09141fdd65f140fe44d8c200a9e.zip | |
Auto merge of #95466 - Dylan-DPC:rollup-g7ddr8y, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #95294 (Document Linux kernel handoff in std::io::copy and std::fs::copy) - #95443 (Clarify how `src/tools/x` searches for python) - #95452 (fix since field version for termination stabilization) - #95460 (Spellchecking compiler code) - #95461 (Spellchecking some comments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/stable_hasher.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/transitive_relation/tests.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_data_structures/src/stable_hasher.rs b/compiler/rustc_data_structures/src/stable_hasher.rs index 31d6a42cf28..e8d81d4b937 100644 --- a/compiler/rustc_data_structures/src/stable_hasher.rs +++ b/compiler/rustc_data_structures/src/stable_hasher.rs @@ -623,7 +623,7 @@ pub enum NodeIdHashingMode { /// result, it needs to include `HashingControls` as part /// of the key, to ensure that is does not produce an incorrect /// result (for example, using a `Fingerprint` produced while -/// hashing `Span`s when a `Fingeprint` without `Span`s is +/// hashing `Span`s when a `Fingerprint` without `Span`s is /// being requested) #[derive(Clone, Hash, Eq, PartialEq, Debug)] pub struct HashingControls { diff --git a/compiler/rustc_data_structures/src/transitive_relation/tests.rs b/compiler/rustc_data_structures/src/transitive_relation/tests.rs index f63b1be1ddc..e1f4c7ee073 100644 --- a/compiler/rustc_data_structures/src/transitive_relation/tests.rs +++ b/compiler/rustc_data_structures/src/transitive_relation/tests.rs @@ -96,7 +96,7 @@ fn mubs_best_choice2() { // // mubs(0,3) = [2] - // Like the precedecing test, but in this case intersection is [2, + // Like the preceding test, but in this case intersection is [2, // 1], and hence we rely on the first pare down call. let mut relation = TransitiveRelation::default(); |