diff options
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 4 | ||||
| -rw-r--r-- | src/librustdoc/clean/types.rs | 3 | ||||
| -rw-r--r-- | src/librustdoc/config.rs | 3 | ||||
| -rw-r--r-- | src/librustdoc/html/format.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/highlight.rs | 3 | ||||
| -rw-r--r-- | src/librustdoc/html/render/search_index.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/scrape_examples.rs | 3 |
7 files changed, 7 insertions, 13 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 95404b33822..cfdd119377f 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1533,9 +1533,7 @@ impl<'tcx> Clean<Type> for Ty<'tcx> { for pb in obj.projection_bounds() { bindings.push(TypeBinding { name: cx.tcx.associated_item(pb.item_def_id()).name, - kind: TypeBindingKind::Equality { - term: pb.skip_binder().term.clean(cx).into(), - }, + kind: TypeBindingKind::Equality { term: pb.skip_binder().term.clean(cx) }, }); } diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index 02633698273..14c93ce2bdc 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -1036,8 +1036,7 @@ impl Attributes { // Additional documentation should be shown before the original documentation let other_attrs = additional_attrs .into_iter() - .map(|(attrs, id)| attrs.iter().map(move |attr| (attr, Some(id)))) - .flatten() + .flat_map(|(attrs, id)| attrs.iter().map(move |attr| (attr, Some(id)))) .chain(attrs.iter().map(|attr| (attr, None))) .filter_map(clean_attr) .collect(); diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs index 959f83a0211..6e483d27f33 100644 --- a/src/librustdoc/config.rs +++ b/src/librustdoc/config.rs @@ -439,13 +439,12 @@ impl Options { matches .opt_str("default-theme") .iter() - .map(|theme| { + .flat_map(|theme| { vec![ ("use-system-theme".to_string(), "false".to_string()), ("theme".to_string(), theme.to_string()), ] }) - .flatten() .collect(), matches .opt_strs("default-setting") diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index f4df9ef4a8c..c0115bfc6d4 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -76,7 +76,7 @@ impl core::fmt::Write for Buffer { } #[inline] - fn write_fmt(self: &mut Self, args: fmt::Arguments<'_>) -> fmt::Result { + fn write_fmt(&mut self, args: fmt::Arguments<'_>) -> fmt::Result { self.buffer.write_fmt(args) } } diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs index 39f58cdd821..06d60b6d06c 100644 --- a/src/librustdoc/html/highlight.rs +++ b/src/librustdoc/html/highlight.rs @@ -274,8 +274,7 @@ impl Decorations { let (mut starts, mut ends): (Vec<_>, Vec<_>) = info .0 .into_iter() - .map(|(kind, ranges)| ranges.into_iter().map(move |(lo, hi)| ((lo, kind), hi))) - .flatten() + .flat_map(|(kind, ranges)| ranges.into_iter().map(move |(lo, hi)| ((lo, kind), hi))) .unzip(); // Sort the sequences in document order. diff --git a/src/librustdoc/html/render/search_index.rs b/src/librustdoc/html/render/search_index.rs index 0ee67467c38..e1309c03b5c 100644 --- a/src/librustdoc/html/render/search_index.rs +++ b/src/librustdoc/html/render/search_index.rs @@ -81,7 +81,7 @@ crate fn build_index<'tcx>(krate: &clean::Crate, cache: &mut Cache, tcx: TyCtxt< lastpathid += 1; if let Some(&(ref fqp, short)) = paths.get(&defid) { - crate_paths.push((short, fqp.last().unwrap().clone())); + crate_paths.push((short, *fqp.last().unwrap())); Some(pathid) } else { None diff --git a/src/librustdoc/scrape_examples.rs b/src/librustdoc/scrape_examples.rs index 899c9e4c629..93292efdcb6 100644 --- a/src/librustdoc/scrape_examples.rs +++ b/src/librustdoc/scrape_examples.rs @@ -247,8 +247,7 @@ crate fn run( let target_crates = options .target_crates .into_iter() - .map(|target| all_crates.iter().filter(move |(_, name)| name.as_str() == target)) - .flatten() + .flat_map(|target| all_crates.iter().filter(move |(_, name)| name.as_str() == target)) .map(|(crate_num, _)| **crate_num) .collect::<Vec<_>>(); |