Skip to content

Commit 0fe5390

Browse files
borsbors
committed
Auto merge of #99046 - nnethercote:final-derive-output-improvements, r=Mark-Simulacrum
Final derive output improvements With all these changes, the derive output in `deriving-all-codegen.stdout` is pretty close to optimal, i.e. very similar to what you'd write by hand. r? `@ghost`
2 parents 116819f + 1cb1d63 commit 0fe5390

File tree

11 files changed

+717
-575
lines changed

11 files changed

+717
-575
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ fn cs_clone_simple(
148148
),
149149
}
150150
}
151-
BlockOrExpr::new_mixed(stmts, cx.expr_deref(trait_span, cx.expr_self(trait_span)))
151+
BlockOrExpr::new_mixed(stmts, Some(cx.expr_deref(trait_span, cx.expr_self(trait_span))))
152152
}
153153

154154
fn cs_clone(
@@ -161,7 +161,7 @@ fn cs_clone(
161161
let all_fields;
162162
let fn_path = cx.std_path(&[sym::clone, sym::Clone, sym::clone]);
163163
let subcall = |cx: &mut ExtCtxt<'_>, field: &FieldInfo| {
164-
let args = vec![cx.expr_addr_of(field.span, field.self_expr.clone())];
164+
let args = vec![field.self_expr.clone()];
165165
cx.expr_call_global(field.span, fn_path.clone(), args)
166166
};
167167

@@ -177,9 +177,7 @@ fn cs_clone(
177177
all_fields = af;
178178
vdata = &variant.data;
179179
}
180-
EnumNonMatchingCollapsed(..) => {
181-
cx.span_bug(trait_span, &format!("non-matching enum variants in `derive({})`", name,))
182-
}
180+
EnumTag(..) => cx.span_bug(trait_span, &format!("enum tags in `derive({})`", name,)),
183181
StaticEnum(..) | StaticStruct(..) => {
184182
cx.span_bug(trait_span, &format!("associated function in `derive({})`", name))
185183
}

‎compiler/rustc_builtin_macros/src/deriving/cmp/ord.rs‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,7 @@ pub fn cs_cmp(cx: &mut ExtCtxt<'_>, span: Span, substr: &Substructure<'_>) -> Bl
6363
let [other_expr] = &field.other_selflike_exprs[..] else {
6464
cx.span_bug(field.span, "not exactly 2 arguments in `derive(Ord)`");
6565
};
66-
let args = vec![
67-
cx.expr_addr_of(field.span, field.self_expr.clone()),
68-
cx.expr_addr_of(field.span, other_expr.clone()),
69-
];
66+
let args = vec![field.self_expr.clone(), other_expr.clone()];
7067
cx.expr_call_global(field.span, cmp_path.clone(), args)
7168
}
7269
CsFold::Combine(span, expr1, expr2) => {
@@ -76,16 +73,6 @@ pub fn cs_cmp(cx: &mut ExtCtxt<'_>, span: Span, substr: &Substructure<'_>) -> Bl
7673
cx.expr_match(span, expr2, vec![eq_arm, neq_arm])
7774
}
7875
CsFold::Fieldless => cx.expr_path(equal_path.clone()),
79-
CsFold::EnumNonMatching(span, tag_tuple) => {
80-
if tag_tuple.len() != 2 {
81-
cx.span_bug(span, "not exactly 2 arguments in `derive(Ord)`")
82-
} else {
83-
let lft = cx.expr_addr_of(span, cx.expr_ident(span, tag_tuple[0]));
84-
let rgt = cx.expr_addr_of(span, cx.expr_ident(span, tag_tuple[1]));
85-
let fn_cmp_path = cx.std_path(&[sym::cmp, sym::Ord, sym::cmp]);
86-
cx.expr_call_global(span, fn_cmp_path, vec![lft, rgt])
87-
}
88-
}
8976
},
9077
);
9178
BlockOrExpr::new_expr(expr)

‎compiler/rustc_builtin_macros/src/deriving/cmp/partial_eq.rs‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ use crate::deriving::generic::ty::*;
22
use crate::deriving::generic::*;
33
use crate::deriving::{path_local, path_std};
44

5-
use rustc_ast::{BinOpKind, MetaItem};
5+
use rustc_ast::ptr::P;
6+
use rustc_ast::{BinOpKind, BorrowKind, Expr, ExprKind, MetaItem, Mutability};
67
use rustc_expand::base::{Annotatable, ExtCtxt};
78
use rustc_span::symbol::sym;
89
use rustc_span::Span;
@@ -32,11 +33,24 @@ pub fn expand_deriving_partial_eq(
3233
let [other_expr] = &field.other_selflike_exprs[..] else {
3334
cx.span_bug(field.span, "not exactly 2 arguments in `derive(PartialEq)`");
3435
};
35-
cx.expr_binary(field.span, op, field.self_expr.clone(), other_expr.clone())
36+
37+
// We received `&T` arguments. Convert them to `T` by
38+
// stripping `&` or adding `*`. This isn't necessary for
39+
// type checking, but it results in much better error
40+
// messages if something goes wrong.
41+
let convert = |expr: &P<Expr>| {
42+
if let ExprKind::AddrOf(BorrowKind::Ref, Mutability::Not, inner) =
43+
&expr.kind
44+
{
45+
inner.clone()
46+
} else {
47+
cx.expr_deref(field.span, expr.clone())
48+
}
49+
};
50+
cx.expr_binary(field.span, op, convert(&field.self_expr), convert(other_expr))
3651
}
3752
CsFold::Combine(span, expr1, expr2) => cx.expr_binary(span, combiner, expr1, expr2),
3853
CsFold::Fieldless => cx.expr_bool(span, base),
39-
CsFold::EnumNonMatching(span, _tag_tuple) => cx.expr_bool(span, !base),
4054
},
4155
);
4256
BlockOrExpr::new_expr(expr)

‎compiler/rustc_builtin_macros/src/deriving/cmp/partial_ord.rs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,7 @@ pub fn cs_partial_cmp(cx: &mut ExtCtxt<'_>, span: Span, substr: &Substructure<'_
7171
let [other_expr] = &field.other_selflike_exprs[..] else {
7272
cx.span_bug(field.span, "not exactly 2 arguments in `derive(Ord)`");
7373
};
74-
let args = vec![
75-
cx.expr_addr_of(field.span, field.self_expr.clone()),
76-
cx.expr_addr_of(field.span, other_expr.clone()),
77-
];
74+
let args = vec![field.self_expr.clone(), other_expr.clone()];
7875
cx.expr_call_global(field.span, partial_cmp_path.clone(), args)
7976
}
8077
CsFold::Combine(span, expr1, expr2) => {
@@ -85,17 +82,6 @@ pub fn cs_partial_cmp(cx: &mut ExtCtxt<'_>, span: Span, substr: &Substructure<'_
8582
cx.expr_match(span, expr2, vec![eq_arm, neq_arm])
8683
}
8784
CsFold::Fieldless => cx.expr_some(span, cx.expr_path(equal_path.clone())),
88-
CsFold::EnumNonMatching(span, tag_tuple) => {
89-
if tag_tuple.len() != 2 {
90-
cx.span_bug(span, "not exactly 2 arguments in `derive(PartialOrd)`")
91-
} else {
92-
let lft = cx.expr_addr_of(span, cx.expr_ident(span, tag_tuple[0]));
93-
let rgt = cx.expr_addr_of(span, cx.expr_ident(span, tag_tuple[1]));
94-
let fn_partial_cmp_path =
95-
cx.std_path(&[sym::cmp, sym::PartialOrd, sym::partial_cmp]);
96-
cx.expr_call_global(span, fn_partial_cmp_path, vec![lft, rgt])
97-
}
98-
}
9985
},
10086
);
10187
BlockOrExpr::new_expr(expr)

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn show_substructure(cx: &mut ExtCtxt<'_>, span: Span, substr: &Substructure<'_>
4545
let (ident, vdata, fields) = match substr.fields {
4646
Struct(vdata, fields) => (substr.type_ident, *vdata, fields),
4747
EnumMatching(_, _, v, fields) => (v.ident, &v.data, fields),
48-
EnumNonMatchingCollapsed(..) | StaticStruct(..) | StaticEnum(..) => {
48+
EnumTag(..) | StaticStruct(..) | StaticEnum(..) => {
4949
cx.span_bug(span, "nonsensical .fields in `#[derive(Debug)]`")
5050
}
5151
};
@@ -95,9 +95,8 @@ fn show_substructure(cx: &mut ExtCtxt<'_>, span: Span, substr: &Substructure<'_>
9595
);
9696
args.push(name);
9797
}
98-
// Use double indirection to make sure this works for unsized types
98+
// Use an extra indirection to make sure this works for unsized types.
9999
let field = cx.expr_addr_of(field.span, field.self_expr.clone());
100-
let field = cx.expr_addr_of(field.span, field);
101100
args.push(field);
102101
}
103102
let expr = cx.expr_call_global(span, fn_path_debug, args);
@@ -115,9 +114,9 @@ fn show_substructure(cx: &mut ExtCtxt<'_>, span: Span, substr: &Substructure<'_>
115114
));
116115
}
117116

118-
// Use double indirection to make sure this works for unsized types
119-
let value_ref = cx.expr_addr_of(field.span, field.self_expr.clone());
120-
value_exprs.push(cx.expr_addr_of(field.span, value_ref));
117+
// Use an extra indirection to make sure this works for unsized types.
118+
let field = cx.expr_addr_of(field.span, field.self_expr.clone());
119+
value_exprs.push(field);
121120
}
122121

123122
// `let names: &'static _ = &["field1", "field2"];`
@@ -177,6 +176,6 @@ fn show_substructure(cx: &mut ExtCtxt<'_>, span: Span, substr: &Substructure<'_>
177176
stmts.push(names_let.unwrap());
178177
}
179178
stmts.push(values_let);
180-
BlockOrExpr::new_mixed(stmts, expr)
179+
BlockOrExpr::new_mixed(stmts, Some(expr))
181180
}
182181
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ fn encodable_substructure(
287287
fn_emit_enum_path,
288288
vec![encoder, cx.expr_str(trait_span, substr.type_ident.name), blk],
289289
);
290-
BlockOrExpr::new_mixed(vec![me], expr)
290+
BlockOrExpr::new_mixed(vec![me], Some(expr))
291291
}
292292

293293
_ => cx.bug("expected Struct or EnumMatching in derive(Encodable)"),

0 commit comments

Comments
 (0)