Skip to content

Commit fdd6af1

Browse files
committed
rustdoc: simplify some & ref erences
1 parent bbb36fe commit fdd6af1

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

src/librustdoc/clean/auto_trait.rs

+7-9
Original file line numberDiff line numberDiff line change
@@ -402,15 +402,13 @@ where
402402
bound_params: Vec::new(),
403403
})
404404
})
405-
.chain(
406-
lifetime_to_bounds.into_iter().filter(|&(_, ref bounds)| !bounds.is_empty()).map(
407-
|(lifetime, bounds)| {
408-
let mut bounds_vec = bounds.into_iter().collect();
409-
self.sort_where_bounds(&mut bounds_vec);
410-
WherePredicate::RegionPredicate { lifetime, bounds: bounds_vec }
411-
},
412-
),
413-
)
405+
.chain(lifetime_to_bounds.into_iter().filter(|(_, bounds)| !bounds.is_empty()).map(
406+
|(lifetime, bounds)| {
407+
let mut bounds_vec = bounds.into_iter().collect();
408+
self.sort_where_bounds(&mut bounds_vec);
409+
WherePredicate::RegionPredicate { lifetime, bounds: bounds_vec }
410+
},
411+
))
414412
.collect()
415413
}
416414

src/librustdoc/clean/simplify.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub(crate) fn where_clauses(cx: &DocContext<'_>, clauses: Vec<WP>) -> ThinVec<WP
4646

4747
// Look for equality predicates on associated types that can be merged into
4848
// general bound predicates.
49-
equalities.retain(|&(ref lhs, ref rhs, ref bound_params)| {
49+
equalities.retain(|(lhs, rhs, bound_params)| {
5050
let Some((ty, trait_did, name)) = lhs.projection() else { return true; };
5151
let Some((bounds, _)) = tybounds.get_mut(ty) else { return true };
5252
let bound_params = bound_params

src/librustdoc/formats/cache.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ impl<'a, 'tcx> DocFolder for CacheBuilder<'a, 'tcx> {
296296
// for where the type was defined. On the other
297297
// hand, `paths` always has the right
298298
// information if present.
299-
Some(&(ref fqp, _)) => Some(&fqp[..fqp.len() - 1]),
299+
Some((fqp, _)) => Some(&fqp[..fqp.len() - 1]),
300300
None => None,
301301
};
302302
((did, path), true)

src/librustdoc/html/format.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ fn fmt_type<'cx>(
962962
clean::Tuple(ref typs) => {
963963
match &typs[..] {
964964
&[] => primitive_link(f, PrimitiveType::Unit, "()", cx),
965-
&[ref one] => {
965+
[one] => {
966966
if let clean::Generic(name) = one {
967967
primitive_link(f, PrimitiveType::Tuple, &format!("({name},)"), cx)
968968
} else {

src/librustdoc/html/render/search_index.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub(crate) fn build_index<'tcx>(
2929
// Attach all orphan items to the type's definition if the type
3030
// has since been learned.
3131
for &OrphanImplItem { parent, ref item, ref impl_generics } in &cache.orphan_impl_items {
32-
if let Some(&(ref fqp, _)) = cache.paths.get(&parent) {
32+
if let Some((fqp, _)) = cache.paths.get(&parent) {
3333
let desc = item
3434
.doc_value()
3535
.map_or_else(String::new, |s| short_markdown_summary(&s, &item.link_names(cache)));
@@ -573,7 +573,7 @@ fn get_fn_inputs_and_outputs<'tcx>(
573573
let decl = &func.decl;
574574

575575
let combined_generics;
576-
let (self_, generics) = if let Some(&(ref impl_self, ref impl_generics)) = impl_generics {
576+
let (self_, generics) = if let Some((impl_self, impl_generics)) = impl_generics {
577577
match (impl_generics.is_empty(), func.generics.is_empty()) {
578578
(true, _) => (Some(impl_self), &func.generics),
579579
(_, true) => (Some(impl_self), impl_generics),

0 commit comments

Comments
 (0)