diff options
| author | bors <bors@rust-lang.org> | 2022-03-02 05:32:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-02 05:32:00 +0000 |
| commit | 2a280de64fb34378174fa33b6866a7ee920ceb8d (patch) | |
| tree | 9399eae34b3e1e5526e28c18d78d10b37afdb221 /compiler/rustc_data_structures | |
| parent | 39a3b527674c1c8d2b9d3edc0cfae67abe6b3ecb (diff) | |
| parent | e89ab08f11332f11d8b574b43f11b9d7b3c18346 (diff) | |
| download | rust-2a280de64fb34378174fa33b6866a7ee920ceb8d.tar.gz rust-2a280de64fb34378174fa33b6866a7ee920ceb8d.zip | |
Auto merge of #94514 - matthiaskrgr:rollup-pdzn82h, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #94464 (Suggest adding a new lifetime parameter when two elided lifetimes should match up for traits and impls.) - #94476 (7 - Make more use of `let_chains`) - #94478 (Fix panic when handling intra doc links generated from macro) - #94482 (compiler: fix some typos) - #94490 (Update books) - #94496 (tests: accept llvm intrinsic in align-checking test) - #94498 (9 - Make more use of `let_chains`) - #94503 (Provide C FFI types via core::ffi, not just in std) - #94513 (update Miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures')
| -rw-r--r-- | compiler/rustc_data_structures/src/sso/either_iter.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_data_structures/src/sso/either_iter.rs b/compiler/rustc_data_structures/src/sso/either_iter.rs index af8ffcf4c13..131eeef4582 100644 --- a/compiler/rustc_data_structures/src/sso/either_iter.rs +++ b/compiler/rustc_data_structures/src/sso/either_iter.rs @@ -7,7 +7,7 @@ use std::iter::Iterator; /// one of two specific implementations. /// /// Note: For most methods providing custom -/// implementation may margianlly +/// implementation may marginally /// improve performance by avoiding /// doing Left/Right match on every step /// and doing it only once instead. |