diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-02-29 18:54:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 18:54:01 +0100 |
| commit | 7d43997053f940d3aa656a5054995a08edf5f3d4 (patch) | |
| tree | 68b172c44e427de40e84a099af257dffe49d9a68 /src/librustdoc/html | |
| parent | b22631bfafe0a6dbe038b180bf838847b39385ea (diff) | |
| parent | de7c40c1686c1c4be74f14493c4b12955e9ed5f2 (diff) | |
| download | rust-7d43997053f940d3aa656a5054995a08edf5f3d4.tar.gz rust-7d43997053f940d3aa656a5054995a08edf5f3d4.zip | |
Rollup merge of #69572 - matthiaskrgr:try_err_and_iter_on_ref, r=Centril
use .iter() instead of .into_iter() on references
Diffstat (limited to 'src/librustdoc/html')
| -rw-r--r-- | src/librustdoc/html/markdown.rs | 4 | ||||
| -rw-r--r-- | src/librustdoc/html/render/cache.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index ff6431640d3..ed007fe383c 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -738,7 +738,7 @@ impl Markdown<'_> { return String::new(); } let replacer = |_: &str, s: &str| { - if let Some(&(_, ref replace)) = links.into_iter().find(|link| &*link.0 == s) { + if let Some(&(_, ref replace)) = links.iter().find(|link| &*link.0 == s) { Some((replace.clone(), s.to_owned())) } else { None @@ -816,7 +816,7 @@ impl MarkdownSummaryLine<'_> { } let replacer = |_: &str, s: &str| { - if let Some(&(_, ref replace)) = links.into_iter().find(|link| &*link.0 == s) { + if let Some(&(_, ref replace)) = links.iter().find(|link| &*link.0 == s) { Some((replace.clone(), s.to_owned())) } else { None diff --git a/src/librustdoc/html/render/cache.rs b/src/librustdoc/html/render/cache.rs index e9ebccb7ec0..a0a35e4ce4b 100644 --- a/src/librustdoc/html/render/cache.rs +++ b/src/librustdoc/html/render/cache.rs @@ -670,7 +670,7 @@ fn get_index_type_name(clean_type: &clean::Type, accept_generic: bool) -> Option match *clean_type { clean::ResolvedPath { ref path, .. } => { let segments = &path.segments; - let path_segment = segments.into_iter().last().unwrap_or_else(|| panic!( + let path_segment = segments.iter().last().unwrap_or_else(|| panic!( "get_index_type_name(clean_type: {:?}, accept_generic: {:?}) had length zero path", clean_type, accept_generic )); |
