diff options
| author | bors <bors@rust-lang.org> | 2020-11-11 22:20:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-11 22:20:07 +0000 |
| commit | 77180db6f81ffdacd14545f1df0a5db55dac1706 (patch) | |
| tree | ff7a83e93470c43f22803d5635264b54e98671d2 /src/tools | |
| parent | 5404efc28a0cddee103ef6396c48ea71ff9631c8 (diff) | |
| parent | 61c0a2c4ac547bc2b5a0a91167c61d295d849fb2 (diff) | |
| download | rust-77180db6f81ffdacd14545f1df0a5db55dac1706.tar.gz rust-77180db6f81ffdacd14545f1df0a5db55dac1706.zip | |
Auto merge of #78956 - jonas-schievink:rollup-r53giob, r=jonas-schievink
Rollup of 11 pull requests Successful merges: - #78216 (Duration::zero() -> Duration::ZERO) - #78354 (Support enable/disable sanitizers/profiler per target) - #78417 (BTreeMap: split off most code of append) - #78832 (look at assoc ct, check the type of nodes) - #78873 (Add flags customizing behaviour of MIR inlining) - #78899 (Support inlining diverging function calls) - #78923 (Cleanup and comment intra-doc link pass) - #78929 (rustc_target: Move target env "gnu" from `linux_base` to `linux_gnu_base`) - #78930 (rustc_taret: Remove `TargetOptions::is_like_android`) - #78942 (Fix typo in comment) - #78947 (Ship llvm-cov through llvm-tools) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/loops.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/clippy/clippy_lints/src/loops.rs b/src/tools/clippy/clippy_lints/src/loops.rs index 32c2562ee95..5a4264f9b5c 100644 --- a/src/tools/clippy/clippy_lints/src/loops.rs +++ b/src/tools/clippy/clippy_lints/src/loops.rs @@ -3089,7 +3089,7 @@ impl<'tcx> Visitor<'tcx> for IterFunctionVisitor { } } -/// Detect the occurences of calls to `iter` or `into_iter` for the +/// Detect the occurrences of calls to `iter` or `into_iter` for the /// given identifier fn detect_iter_and_into_iters<'tcx>(block: &'tcx Block<'tcx>, identifier: Ident) -> Option<Vec<IterFunction>> { let mut visitor = IterFunctionVisitor { |