Skip to content

Commit 9b74613

Browse files
committed
---
yaml --- r: 63845 b: refs/heads/snap-stage3 c: 5943118 h: refs/heads/master i: 63843: bb3aa58 v: v3
1 parent c6ede38 commit 9b74613

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 0252693db21f48a516f9a36cdeb8b2dd7e33bd02
4+
refs/heads/snap-stage3: 59431187284b377bdffdf16eda01c9239359592e
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/common.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,8 @@ pub struct ValSelfData {
130130
// will only be set in the case of default methods.
131131
pub struct param_substs {
132132
tys: ~[ty::t],
133-
vtables: Option<typeck::vtable_res>,
134-
type_param_defs: @~[ty::TypeParameterDef],
135133
self_ty: Option<ty::t>,
134+
vtables: Option<typeck::vtable_res>,
136135
self_vtable: Option<typeck::vtable_origin>
137136
}
138137

@@ -144,10 +143,9 @@ impl param_substs {
144143
}
145144

146145
fn param_substs_to_str(this: &param_substs, tcx: ty::ctxt) -> ~str {
147-
fmt!("param_substs {tys:%s, vtables:%s, type_param_defs:%s}",
146+
fmt!("param_substs {tys:%s, vtables:%s}",
148147
this.tys.repr(tcx),
149-
this.vtables.repr(tcx),
150-
this.type_param_defs.repr(tcx))
148+
this.vtables.repr(tcx))
151149
}
152150

153151
impl Repr for param_substs {

branches/snap-stage3/src/librustc/middle/trans/monomorphize.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ pub fn monomorphic_fn(ccx: @mut CrateContext,
177177
let psubsts = Some(@param_substs {
178178
tys: substs,
179179
vtables: vtables,
180-
type_param_defs: tpt.generics.type_param_defs,
181180
self_ty: real_substs.self_ty,
182181
self_vtable: self_vtable
183182
});

0 commit comments

Comments
 (0)