Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit d121aa3

Browse files
borsbors
committed
Auto merge of rust-lang#104776 - Dylan-DPC:rollup-rf4c2u0, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - rust-lang#104269 (Fix hang in where-clause suggestion with `predicate_can_apply`) - rust-lang#104286 (copy doc output files by format) - rust-lang#104509 (Use obligation ctxt instead of dyn TraitEngine) - rust-lang#104721 (Remove more `ref` patterns from the compiler) - rust-lang#104744 (rustdoc: give struct fields CSS `display: block`) - rust-lang#104751 (Fix an ICE parsing a malformed attribute.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 80b3c6d + 5d7b68c commit d121aa3

File tree

38 files changed

+516
-433
lines changed

38 files changed

+516
-433
lines changed

‎compiler/rustc_arena/src/tests.rs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,15 @@ fn test_arena_alloc_nested() {
5252

5353
impl<'a> Wrap<'a> {
5454
fn alloc_inner<F: Fn() -> Inner>(&self, f: F) -> &Inner {
55-
let r: &EI<'_> = self.0.alloc(EI::I(f()));
56-
if let &EI::I(ref i) = r {
57-
i
58-
} else {
59-
panic!("mismatch");
55+
match self.0.alloc(EI::I(f())) {
56+
EI::I(i) => i,
57+
_ => panic!("mismatch"),
6058
}
6159
}
6260
fn alloc_outer<F: Fn() -> Outer<'a>>(&self, f: F) -> &Outer<'_> {
63-
let r: &EI<'_> = self.0.alloc(EI::O(f()));
64-
if let &EI::O(ref o) = r {
65-
o
66-
} else {
67-
panic!("mismatch");
61+
match self.0.alloc(EI::O(f())) {
62+
EI::O(o) => o,
63+
_ => panic!("mismatch"),
6864
}
6965
}
7066
}

‎compiler/rustc_ast/src/attr/mod.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -618,9 +618,12 @@ impl MetaItemKind {
618618
}) => MetaItemKind::list_from_tokens(tokens.clone()),
619619
AttrArgs::Delimited(..) => None,
620620
AttrArgs::Eq(_, AttrArgsEq::Ast(expr)) => match expr.kind {
621-
ast::ExprKind::Lit(token_lit) => Some(MetaItemKind::NameValue(
622-
Lit::from_token_lit(token_lit, expr.span).expect("token_lit in from_attr_args"),
623-
)),
621+
ast::ExprKind::Lit(token_lit) => {
622+
// Turn failures to `None`, we'll get parse errors elsewhere.
623+
Lit::from_token_lit(token_lit, expr.span)
624+
.ok()
625+
.map(|lit| MetaItemKind::NameValue(lit))
626+
}
624627
_ => None,
625628
},
626629
AttrArgs::Eq(_, AttrArgsEq::Hir(lit)) => Some(MetaItemKind::NameValue(lit.clone())),

‎compiler/rustc_ast_lowering/src/asm.rs‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
123123
.operands
124124
.iter()
125125
.map(|(op, op_sp)| {
126-
let lower_reg = |reg| match reg {
126+
let lower_reg = |&reg: &_| match reg {
127127
InlineAsmRegOrRegClass::Reg(reg) => {
128128
asm::InlineAsmRegOrRegClass::Reg(if let Some(asm_arch) = asm_arch {
129129
asm::InlineAsmReg::parse(asm_arch, reg).unwrap_or_else(|error| {
@@ -152,32 +152,30 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
152152
}
153153
};
154154

155-
let op = match *op {
156-
InlineAsmOperand::In { reg, ref expr } => hir::InlineAsmOperand::In {
155+
let op = match op {
156+
InlineAsmOperand::In { reg, expr } => hir::InlineAsmOperand::In {
157157
reg: lower_reg(reg),
158158
expr: self.lower_expr(expr),
159159
},
160-
InlineAsmOperand::Out { reg, late, ref expr } => hir::InlineAsmOperand::Out {
160+
InlineAsmOperand::Out { reg, late, expr } => hir::InlineAsmOperand::Out {
161161
reg: lower_reg(reg),
162-
late,
162+
late: *late,
163163
expr: expr.as_ref().map(|expr| self.lower_expr(expr)),
164164
},
165-
InlineAsmOperand::InOut { reg, late, ref expr } => {
166-
hir::InlineAsmOperand::InOut {
167-
reg: lower_reg(reg),
168-
late,
169-
expr: self.lower_expr(expr),
170-
}
171-
}
172-
InlineAsmOperand::SplitInOut { reg, late, ref in_expr, ref out_expr } => {
165+
InlineAsmOperand::InOut { reg, late, expr } => hir::InlineAsmOperand::InOut {
166+
reg: lower_reg(reg),
167+
late: *late,
168+
expr: self.lower_expr(expr),
169+
},
170+
InlineAsmOperand::SplitInOut { reg, late, in_expr, out_expr } => {
173171
hir::InlineAsmOperand::SplitInOut {
174172
reg: lower_reg(reg),
175-
late,
173+
late: *late,
176174
in_expr: self.lower_expr(in_expr),
177175
out_expr: out_expr.as_ref().map(|expr| self.lower_expr(expr)),
178176
}
179177
}
180-
InlineAsmOperand::Const { ref anon_const } => {
178+
InlineAsmOperand::Const { anon_const } => {
181179
if !self.tcx.features().asm_const {
182180
feature_err(
183181
&sess.parse_sess,
@@ -191,7 +189,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
191189
anon_const: self.lower_anon_const(anon_const),
192190
}
193191
}
194-
InlineAsmOperand::Sym { ref sym } => {
192+
InlineAsmOperand::Sym { sym } => {
195193
let static_def_id = self
196194
.resolver
197195
.get_partial_res(sym.id)
@@ -347,7 +345,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
347345
skip = true;
348346

349347
let idx2 = *o.get();
350-
let &(ref op2, op_sp2) = &operands[idx2];
348+
let (ref op2, op_sp2) = operands[idx2];
351349
let Some(asm::InlineAsmRegOrRegClass::Reg(reg2)) = op2.reg() else {
352350
unreachable!();
353351
};

‎compiler/rustc_ast_lowering/src/block.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
3131
let mut stmts = SmallVec::<[hir::Stmt<'hir>; 8]>::new();
3232
let mut expr = None;
3333
while let [s, tail @ ..] = ast_stmts {
34-
match s.kind {
35-
StmtKind::Local(ref local) => {
34+
match &s.kind {
35+
StmtKind::Local(local) => {
3636
let hir_id = self.lower_node_id(s.id);
3737
let local = self.lower_local(local);
3838
self.alias_attrs(hir_id, local.hir_id);
3939
let kind = hir::StmtKind::Local(local);
4040
let span = self.lower_span(s.span);
4141
stmts.push(hir::Stmt { hir_id, kind, span });
4242
}
43-
StmtKind::Item(ref it) => {
43+
StmtKind::Item(it) => {
4444
stmts.extend(self.lower_item_ref(it).into_iter().enumerate().map(
4545
|(i, item_id)| {
4646
let hir_id = match i {
@@ -53,7 +53,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
5353
},
5454
));
5555
}
56-
StmtKind::Expr(ref e) => {
56+
StmtKind::Expr(e) => {
5757
let e = self.lower_expr(e);
5858
if tail.is_empty() {
5959
expr = Some(e);
@@ -65,7 +65,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
6565
stmts.push(hir::Stmt { hir_id, kind, span });
6666
}
6767
}
68-
StmtKind::Semi(ref e) => {
68+
StmtKind::Semi(e) => {
6969
let e = self.lower_expr(e);
7070
let hir_id = self.lower_node_id(s.id);
7171
self.alias_attrs(hir_id, e.hir_id);

0 commit comments

Comments
 (0)