Skip to content

Commit 89f6917

Browse files
committed
Remove Substructure::self_args.
It's unused.
1 parent 1254fe9 commit 89f6917

File tree

1 file changed

+2
-18
lines changed
  • compiler/rustc_builtin_macros/src/deriving/generic

1 file changed

+2
-18
lines changed

compiler/rustc_builtin_macros/src/deriving/generic/mod.rs

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,7 @@ pub struct MethodDef<'a> {
247247
pub struct Substructure<'a> {
248248
/// ident of self
249249
pub type_ident: Ident,
250-
/// dereferenced access to any [`Self_`] or [`Ptr(Self_, _)`][ptr] arguments
251-
///
252-
/// [`Self_`]: ty::Ty::Self_
253-
/// [ptr]: ty::Ty::Ptr
254-
pub self_args: &'a [P<Expr>],
255-
/// verbatim access to any other arguments
250+
/// verbatim access to any non-self arguments
256251
pub nonself_args: &'a [P<Expr>],
257252
pub fields: &'a SubstructureFields<'a>,
258253
}
@@ -753,7 +748,6 @@ impl<'a> TraitDef<'a> {
753748
self,
754749
struct_def,
755750
type_ident,
756-
&self_args,
757751
&nonself_args,
758752
)
759753
} else {
@@ -802,7 +796,6 @@ impl<'a> TraitDef<'a> {
802796
self,
803797
enum_def,
804798
type_ident,
805-
&self_args,
806799
&nonself_args,
807800
)
808801
} else {
@@ -830,12 +823,11 @@ impl<'a> MethodDef<'a> {
830823
cx: &mut ExtCtxt<'_>,
831824
trait_: &TraitDef<'_>,
832825
type_ident: Ident,
833-
self_args: &[P<Expr>],
834826
nonself_args: &[P<Expr>],
835827
fields: &SubstructureFields<'_>,
836828
) -> P<Expr> {
837829
let span = trait_.span;
838-
let substructure = Substructure { type_ident, self_args, nonself_args, fields };
830+
let substructure = Substructure { type_ident, nonself_args, fields };
839831
let mut f = self.combine_substructure.borrow_mut();
840832
let f: &mut CombineSubstructureFunc<'_> = &mut *f;
841833
f(cx, span, &substructure)
@@ -1053,7 +1045,6 @@ impl<'a> MethodDef<'a> {
10531045
cx,
10541046
trait_,
10551047
type_ident,
1056-
self_args,
10571048
nonself_args,
10581049
&Struct(struct_def, fields),
10591050
);
@@ -1074,7 +1065,6 @@ impl<'a> MethodDef<'a> {
10741065
trait_: &TraitDef<'_>,
10751066
struct_def: &VariantData,
10761067
type_ident: Ident,
1077-
self_args: &[P<Expr>],
10781068
nonself_args: &[P<Expr>],
10791069
) -> P<Expr> {
10801070
let summary = trait_.summarise_struct(cx, struct_def);
@@ -1083,7 +1073,6 @@ impl<'a> MethodDef<'a> {
10831073
cx,
10841074
trait_,
10851075
type_ident,
1086-
self_args,
10871076
nonself_args,
10881077
&StaticStruct(struct_def, summary),
10891078
)
@@ -1267,7 +1256,6 @@ impl<'a> MethodDef<'a> {
12671256
cx,
12681257
trait_,
12691258
type_ident,
1270-
&self_args[..],
12711259
nonself_args,
12721260
&substructure,
12731261
);
@@ -1286,7 +1274,6 @@ impl<'a> MethodDef<'a> {
12861274
cx,
12871275
trait_,
12881276
type_ident,
1289-
&self_args[..],
12901277
nonself_args,
12911278
&substructure,
12921279
))
@@ -1357,7 +1344,6 @@ impl<'a> MethodDef<'a> {
13571344
cx,
13581345
trait_,
13591346
type_ident,
1360-
&self_args[..],
13611347
nonself_args,
13621348
&catch_all_substructure,
13631349
);
@@ -1455,7 +1441,6 @@ impl<'a> MethodDef<'a> {
14551441
trait_: &TraitDef<'_>,
14561442
enum_def: &EnumDef,
14571443
type_ident: Ident,
1458-
self_args: &[P<Expr>],
14591444
nonself_args: &[P<Expr>],
14601445
) -> P<Expr> {
14611446
let summary = enum_def
@@ -1471,7 +1456,6 @@ impl<'a> MethodDef<'a> {
14711456
cx,
14721457
trait_,
14731458
type_ident,
1474-
self_args,
14751459
nonself_args,
14761460
&StaticEnum(enum_def, summary),
14771461
)

0 commit comments

Comments
 (0)