Skip to content

Commit db69136

Browse files
borsbors
committed
Auto merge of #80655 - GuillaumeGomez:rollup-ai7soid, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #80580 (Add suggestion for "ignore" doc code block) - #80591 (remove allow(incomplete_features) from std) - #80617 (Detect invalid rustdoc test commands) - #80628 (reduce borrowing and (de)referencing around match patterns (clippy::match_ref_pats)) - #80646 (Clean up in `each_child_of_item`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents bcd6975 + 539c435 commit db69136

File tree

36 files changed

+159
-119
lines changed

36 files changed

+159
-119
lines changed

‎compiler/rustc_ast/src/ast.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,9 @@ pub enum WherePredicate {
433433
impl WherePredicate {
434434
pub fn span(&self) -> Span {
435435
match self {
436-
&WherePredicate::BoundPredicate(ref p) => p.span,
437-
&WherePredicate::RegionPredicate(ref p) => p.span,
438-
&WherePredicate::EqPredicate(ref p) => p.span,
436+
WherePredicate::BoundPredicate(p) => p.span,
437+
WherePredicate::RegionPredicate(p) => p.span,
438+
WherePredicate::EqPredicate(p) => p.span,
439439
}
440440
}
441441
}

‎compiler/rustc_ast_passes/src/ast_validation.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1212,11 +1212,11 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
12121212
}
12131213

12141214
fn visit_pat(&mut self, pat: &'a Pat) {
1215-
match pat.kind {
1216-
PatKind::Lit(ref expr) => {
1215+
match &pat.kind {
1216+
PatKind::Lit(expr) => {
12171217
self.check_expr_within_pat(expr, false);
12181218
}
1219-
PatKind::Range(ref start, ref end, _) => {
1219+
PatKind::Range(start, end, _) => {
12201220
if let Some(expr) = start {
12211221
self.check_expr_within_pat(expr, true);
12221222
}

‎compiler/rustc_builtin_macros/src/deriving/hash.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ pub fn expand_deriving_hash(
4848
}
4949

5050
fn hash_substructure(cx: &mut ExtCtxt<'_>, trait_span: Span, substr: &Substructure<'_>) -> P<Expr> {
51-
let state_expr = match &substr.nonself_args {
52-
&[o_f] => o_f,
51+
let state_expr = match substr.nonself_args {
52+
[o_f] => o_f,
5353
_ => cx.span_bug(trait_span, "incorrect number of arguments in `derive(Hash)`"),
5454
};
5555
let call_hash = |span, thing_expr| {
@@ -64,9 +64,9 @@ fn hash_substructure(cx: &mut ExtCtxt<'_>, trait_span: Span, substr: &Substructu
6464
};
6565
let mut stmts = Vec::new();
6666

67-
let fields = match *substr.fields {
68-
Struct(_, ref fs) | EnumMatching(_, 1, .., ref fs) => fs,
69-
EnumMatching(.., ref fs) => {
67+
let fields = match substr.fields {
68+
Struct(_, fs) | EnumMatching(_, 1, .., fs) => fs,
69+
EnumMatching(.., fs) => {
7070
let variant_value = deriving::call_intrinsic(
7171
cx,
7272
trait_span,

‎compiler/rustc_hir/src/hir.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,9 @@ impl GenericBound<'_> {
378378

379379
pub fn span(&self) -> Span {
380380
match self {
381-
&GenericBound::Trait(ref t, ..) => t.span,
382-
&GenericBound::LangItemTrait(_, span, ..) => span,
383-
&GenericBound::Outlives(ref l) => l.span,
381+
GenericBound::Trait(t, ..) => t.span,
382+
GenericBound::LangItemTrait(_, span, ..) => *span,
383+
GenericBound::Outlives(l) => l.span,
384384
}
385385
}
386386
}
@@ -538,9 +538,9 @@ pub enum WherePredicate<'hir> {
538538
impl WherePredicate<'_> {
539539
pub fn span(&self) -> Span {
540540
match self {
541-
&WherePredicate::BoundPredicate(ref p) => p.span,
542-
&WherePredicate::RegionPredicate(ref p) => p.span,
543-
&WherePredicate::EqPredicate(ref p) => p.span,
541+
WherePredicate::BoundPredicate(p) => p.span,
542+
WherePredicate::RegionPredicate(p) => p.span,
543+
WherePredicate::EqPredicate(p) => p.span,
544544
}
545545
}
546546
}

‎compiler/rustc_hir/src/intravisit.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -896,8 +896,8 @@ pub fn walk_where_predicate<'v, V: Visitor<'v>>(
896896
visitor: &mut V,
897897
predicate: &'v WherePredicate<'v>,
898898
) {
899-
match predicate {
900-
&WherePredicate::BoundPredicate(WhereBoundPredicate {
899+
match *predicate {
900+
WherePredicate::BoundPredicate(WhereBoundPredicate {
901901
ref bounded_ty,
902902
bounds,
903903
bound_generic_params,
@@ -907,11 +907,11 @@ pub fn walk_where_predicate<'v, V: Visitor<'v>>(
907907
walk_list!(visitor, visit_param_bound, bounds);
908908
walk_list!(visitor, visit_generic_param, bound_generic_params);
909909
}
910-
&WherePredicate::RegionPredicate(WhereRegionPredicate { ref lifetime, bounds, .. }) => {
910+
WherePredicate::RegionPredicate(WhereRegionPredicate { ref lifetime, bounds, .. }) => {
911911
visitor.visit_lifetime(lifetime);
912912
walk_list!(visitor, visit_param_bound, bounds);
913913
}
914-
&WherePredicate::EqPredicate(WhereEqPredicate {
914+
WherePredicate::EqPredicate(WhereEqPredicate {
915915
hir_id, ref lhs_ty, ref rhs_ty, ..
916916
}) => {
917917
visitor.visit_id(hir_id);

‎compiler/rustc_hir_pretty/src/lib.rs

+9-11
Original file line numberDiff line numberDiff line change
@@ -2233,19 +2233,19 @@ impl<'a> State<'a> {
22332233
}
22342234

22352235
match predicate {
2236-
&hir::WherePredicate::BoundPredicate(hir::WhereBoundPredicate {
2237-
ref bound_generic_params,
2238-
ref bounded_ty,
2236+
hir::WherePredicate::BoundPredicate(hir::WhereBoundPredicate {
2237+
bound_generic_params,
2238+
bounded_ty,
22392239
bounds,
22402240
..
22412241
}) => {
22422242
self.print_formal_generic_params(bound_generic_params);
22432243
self.print_type(&bounded_ty);
2244-
self.print_bounds(":", bounds);
2244+
self.print_bounds(":", *bounds);
22452245
}
2246-
&hir::WherePredicate::RegionPredicate(hir::WhereRegionPredicate {
2247-
ref lifetime,
2248-
ref bounds,
2246+
hir::WherePredicate::RegionPredicate(hir::WhereRegionPredicate {
2247+
lifetime,
2248+
bounds,
22492249
..
22502250
}) => {
22512251
self.print_lifetime(lifetime);
@@ -2264,10 +2264,8 @@ impl<'a> State<'a> {
22642264
}
22652265
}
22662266
}
2267-
&hir::WherePredicate::EqPredicate(hir::WhereEqPredicate {
2268-
ref lhs_ty,
2269-
ref rhs_ty,
2270-
..
2267+
hir::WherePredicate::EqPredicate(hir::WhereEqPredicate {
2268+
lhs_ty, rhs_ty, ..
22712269
}) => {
22722270
self.print_type(lhs_ty);
22732271
self.s.space();

‎compiler/rustc_incremental/src/assert_dep_graph.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,13 @@ fn filter_nodes<'q>(
310310
sources: &Option<FxHashSet<&'q DepNode>>,
311311
targets: &Option<FxHashSet<&'q DepNode>>,
312312
) -> FxHashSet<&'q DepNode> {
313-
if let &Some(ref sources) = sources {
314-
if let &Some(ref targets) = targets {
313+
if let Some(sources) = sources {
314+
if let Some(targets) = targets {
315315
walk_between(query, sources, targets)
316316
} else {
317317
walk_nodes(query, sources, OUTGOING)
318318
}
319-
} else if let &Some(ref targets) = targets {
319+
} else if let Some(targets) = targets {
320320
walk_nodes(query, targets, INCOMING)
321321
} else {
322322
query.nodes().into_iter().collect()

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
915915
self.highlight_outer(&mut t1_out, &mut t2_out, path, sub, i, &other_ty);
916916
return Some(());
917917
}
918-
if let &ty::Adt(def, _) = ta.kind() {
918+
if let ty::Adt(def, _) = ta.kind() {
919919
let path_ = self.tcx.def_path_str(def.did);
920920
if path_ == other_path {
921921
self.highlight_outer(&mut t1_out, &mut t2_out, path, sub, i, &other_ty);

‎compiler/rustc_lint/src/builtin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -938,8 +938,8 @@ impl EarlyLintPass for DeprecatedAttr {
938938
if attr.ident().map(|ident| ident.name) == Some(n) {
939939
if let &AttributeGate::Gated(
940940
Stability::Deprecated(link, suggestion),
941-
ref name,
942-
ref reason,
941+
name,
942+
reason,
943943
_,
944944
) = g
945945
{

‎compiler/rustc_lint/src/nonstandard_style.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ impl<'tcx> LateLintPass<'tcx> for NonSnakeCase {
412412
}
413413

414414
fn check_pat(&mut self, cx: &LateContext<'_>, p: &hir::Pat<'_>) {
415-
if let &PatKind::Binding(_, hid, ident, _) = &p.kind {
415+
if let PatKind::Binding(_, hid, ident, _) = p.kind {
416416
if let hir::Node::Pat(parent_pat) = cx.tcx.hir().get(cx.tcx.hir().get_parent_node(hid))
417417
{
418418
if let PatKind::Struct(_, field_pats, _) = &parent_pat.kind {

‎compiler/rustc_lint/src/unused.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -862,11 +862,11 @@ impl EarlyLintPass for UnusedParens {
862862
}
863863

864864
fn check_ty(&mut self, cx: &EarlyContext<'_>, ty: &ast::Ty) {
865-
if let &ast::TyKind::Paren(ref r) = &ty.kind {
865+
if let ast::TyKind::Paren(r) = &ty.kind {
866866
match &r.kind {
867-
&ast::TyKind::TraitObject(..) => {}
868-
&ast::TyKind::ImplTrait(_, ref bounds) if bounds.len() > 1 => {}
869-
&ast::TyKind::Array(_, ref len) => {
867+
ast::TyKind::TraitObject(..) => {}
868+
ast::TyKind::ImplTrait(_, bounds) if bounds.len() > 1 => {}
869+
ast::TyKind::Array(_, len) => {
870870
self.check_unused_delims_expr(
871871
cx,
872872
&len.value,

‎compiler/rustc_metadata/src/native_libs.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,13 @@ impl Collector<'tcx> {
192192
fn process_command_line(&mut self) {
193193
// First, check for errors
194194
let mut renames = FxHashSet::default();
195-
for &(ref name, ref new_name, _) in &self.tcx.sess.opts.libs {
196-
if let &Some(ref new_name) = new_name {
195+
for (name, new_name, _) in &self.tcx.sess.opts.libs {
196+
if let Some(ref new_name) = new_name {
197197
let any_duplicate = self
198198
.libs
199199
.iter()
200200
.filter_map(|lib| lib.name.as_ref())
201-
.any(|n| n.as_str() == *name);
201+
.any(|n| &n.as_str() == name);
202202
if new_name.is_empty() {
203203
self.tcx.sess.err(&format!(
204204
"an empty renaming target was specified for library `{}`",
@@ -240,7 +240,7 @@ impl Collector<'tcx> {
240240
if kind != NativeLibKind::Unspecified {
241241
lib.kind = kind;
242242
}
243-
if let &Some(ref new_name) = new_name {
243+
if let Some(new_name) = new_name {
244244
lib.name = Some(Symbol::intern(new_name));
245245
}
246246
return true;

‎compiler/rustc_metadata/src/rmeta/decoder.rs

+12-17
Original file line numberDiff line numberDiff line change
@@ -1055,19 +1055,15 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
10551055

10561056
// Iterate over all children.
10571057
let macros_only = self.dep_kind.lock().macros_only();
1058-
let children = self.root.tables.children.get(self, id).unwrap_or_else(Lazy::empty);
1059-
for child_index in children.decode((self, sess)) {
1060-
if macros_only {
1061-
continue;
1062-
}
1063-
1064-
// Get the item.
1065-
if let Some(child_kind) = self.maybe_kind(child_index) {
1066-
match child_kind {
1067-
EntryKind::MacroDef(..) => {}
1068-
_ if macros_only => continue,
1069-
_ => {}
1070-
}
1058+
if !macros_only {
1059+
let children = self.root.tables.children.get(self, id).unwrap_or_else(Lazy::empty);
1060+
1061+
for child_index in children.decode((self, sess)) {
1062+
// Get the item.
1063+
let child_kind = match self.maybe_kind(child_index) {
1064+
Some(child_kind) => child_kind,
1065+
None => continue,
1066+
};
10711067

10721068
// Hand off the item to the callback.
10731069
match child_kind {
@@ -1102,8 +1098,8 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
11021098
}
11031099

11041100
let def_key = self.def_key(child_index);
1105-
let span = self.get_span(child_index, sess);
11061101
if def_key.disambiguated_data.data.get_opt_name().is_some() {
1102+
let span = self.get_span(child_index, sess);
11071103
let kind = self.def_kind(child_index);
11081104
let ident = self.item_ident(child_index, sess);
11091105
let vis = self.get_visibility(child_index);
@@ -1137,9 +1133,8 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
11371133
// within the crate. We only need this for fictive constructors,
11381134
// for other constructors correct visibilities
11391135
// were already encoded in metadata.
1140-
let attrs: Vec<_> =
1141-
self.get_item_attrs(def_id.index, sess).collect();
1142-
if sess.contains_name(&attrs, sym::non_exhaustive) {
1136+
let mut attrs = self.get_item_attrs(def_id.index, sess);
1137+
if attrs.any(|item| item.has_name(sym::non_exhaustive)) {
11431138
let crate_def_id = self.local_def_id(CRATE_DEF_INDEX);
11441139
vis = ty::Visibility::Restricted(crate_def_id);
11451140
}

‎compiler/rustc_middle/src/ty/diagnostics.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ pub fn suggest_constraining_type_param(
245245
}
246246
}
247247

248-
match &param_spans[..] {
249-
&[&param_span] => suggest_restrict(param_span.shrink_to_hi()),
248+
match param_spans[..] {
249+
[&param_span] => suggest_restrict(param_span.shrink_to_hi()),
250250
_ => {
251251
err.span_suggestion_verbose(
252252
generics.where_clause.tail_span_for_suggestion(),

‎compiler/rustc_mir/src/borrow_check/diagnostics/move_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
302302
.find_map(|p| self.is_upvar_field_projection(p));
303303

304304
let deref_base = match deref_target_place.projection.as_ref() {
305-
&[ref proj_base @ .., ProjectionElem::Deref] => {
305+
[proj_base @ .., ProjectionElem::Deref] => {
306306
PlaceRef { local: deref_target_place.local, projection: &proj_base }
307307
}
308308
_ => bug!("deref_target_place is not a deref projection"),

‎compiler/rustc_mir/src/borrow_check/type_check/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1855,8 +1855,8 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
18551855
self.assert_iscleanup(body, block_data, unwind, true);
18561856
}
18571857
}
1858-
TerminatorKind::InlineAsm { ref destination, .. } => {
1859-
if let &Some(target) = destination {
1858+
TerminatorKind::InlineAsm { destination, .. } => {
1859+
if let Some(target) = destination {
18601860
self.assert_iscleanup(body, block_data, target, is_cleanup);
18611861
}
18621862
}

‎compiler/rustc_passes/src/naked_functions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ impl<'tcx> Visitor<'tcx> for CheckParameters<'tcx> {
149149
fn check_asm<'tcx>(tcx: TyCtxt<'tcx>, hir_id: HirId, body: &'tcx hir::Body<'tcx>, fn_span: Span) {
150150
let mut this = CheckInlineAssembly { tcx, items: Vec::new() };
151151
this.visit_body(body);
152-
if let &[(ItemKind::Asm, _)] = &this.items[..] {
152+
if let [(ItemKind::Asm, _)] = this.items[..] {
153153
// Ok.
154154
} else {
155155
tcx.struct_span_lint_hir(UNSUPPORTED_NAKED_FUNCTIONS, hir_id, fn_span, |lint| {

‎compiler/rustc_save_analysis/src/dump_visitor.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ impl<'tcx> DumpVisitor<'tcx> {
582582
}
583583
ref v => {
584584
let mut value = format!("{}::{}", enum_data.name, name);
585-
if let &hir::VariantData::Tuple(ref fields, _) = v {
585+
if let hir::VariantData::Tuple(fields, _) = v {
586586
value.push('(');
587587
value.push_str(
588588
&fields
@@ -653,7 +653,7 @@ impl<'tcx> DumpVisitor<'tcx> {
653653
let map = &self.tcx.hir();
654654
self.nest_typeck_results(map.local_def_id(item.hir_id), |v| {
655655
v.visit_ty(&typ);
656-
if let &Some(ref trait_ref) = trait_ref {
656+
if let Some(trait_ref) = trait_ref {
657657
v.process_path(trait_ref.hir_ref_id, &hir::QPath::Resolved(None, &trait_ref.path));
658658
}
659659
v.process_generic_params(generics, "", item.hir_id);
@@ -1082,7 +1082,7 @@ impl<'tcx> DumpVisitor<'tcx> {
10821082
);
10831083
}
10841084

1085-
if let &Some(ref default_ty) = default_ty {
1085+
if let Some(default_ty) = default_ty {
10861086
self.visit_ty(default_ty)
10871087
}
10881088
}

‎compiler/rustc_trait_selection/src/traits/auto_trait.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ impl AutoTraitFinder<'tcx> {
305305
infcx.resolve_vars_if_possible(Obligation::new(dummy_cause.clone(), new_env, pred));
306306
let result = select.select(&obligation);
307307

308-
match &result {
309-
&Ok(Some(ref impl_source)) => {
308+
match result {
309+
Ok(Some(ref impl_source)) => {
310310
// If we see an explicit negative impl (e.g., `impl !Send for MyStruct`),
311311
// we immediately bail out, since it's impossible for us to continue.
312312

@@ -339,8 +339,8 @@ impl AutoTraitFinder<'tcx> {
339339
return None;
340340
}
341341
}
342-
&Ok(None) => {}
343-
&Err(SelectionError::Unimplemented) => {
342+
Ok(None) => {}
343+
Err(SelectionError::Unimplemented) => {
344344
if self.is_param_no_infer(pred.skip_binder().trait_ref.substs) {
345345
already_visited.remove(&pred);
346346
self.add_user_pred(
@@ -863,7 +863,7 @@ impl<'a, 'tcx> TypeFolder<'tcx> for RegionReplacer<'a, 'tcx> {
863863

864864
fn fold_region(&mut self, r: ty::Region<'tcx>) -> ty::Region<'tcx> {
865865
(match r {
866-
&ty::ReVar(vid) => self.vid_to_region.get(&vid).cloned(),
866+
ty::ReVar(vid) => self.vid_to_region.get(vid).cloned(),
867867
_ => None,
868868
})
869869
.unwrap_or_else(|| r.super_fold_with(self))

‎compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'tcx> for InferCtxt<'a, 'tcx> {
13681368
code: &ObligationCauseCode<'tcx>,
13691369
) -> Option<(String, Option<Span>)> {
13701370
match code {
1371-
&ObligationCauseCode::BuiltinDerivedObligation(ref data) => {
1371+
ObligationCauseCode::BuiltinDerivedObligation(data) => {
13721372
let parent_trait_ref = self.resolve_vars_if_possible(data.parent_trait_ref);
13731373
match self.get_parent_trait_ref(&data.parent_code) {
13741374
Some(t) => Some(t),

0 commit comments

Comments
 (0)