Skip to content

Commit fab6f52

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 169870 b: refs/heads/auto c: 0cb34a3 h: refs/heads/master v: v3
1 parent 01830a6 commit fab6f52

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: bd9eef7ac64b4263c9db25d74b7cc57958909ddc
13+
refs/heads/auto: 0cb34a3609a028ad0bcaa8e200f97b18bb17383e
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/metadata/encoder.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ pub enum InlinedItemRef<'a> {
5959

6060
pub type Encoder<'a> = writer::Encoder<'a, SeekableMemWriter>;
6161

62-
pub type EncodeInlinedItem<'a> = |ecx: &EncodeContext,
63-
rbml_w: &mut Encoder,
64-
ii: InlinedItemRef|: 'a;
62+
pub type EncodeInlinedItem<'a> =
63+
Box<FnMut(&EncodeContext, &mut Encoder, InlinedItemRef) + 'a>;
6564

6665
pub struct EncodeParams<'a, 'tcx: 'a> {
6766
pub diag: &'a SpanHandler,
@@ -953,7 +952,7 @@ fn encode_inlined_item(ecx: &EncodeContext,
953952
ii: InlinedItemRef) {
954953
let mut eii = ecx.encode_inlined_item.borrow_mut();
955954
let eii: &mut EncodeInlinedItem = &mut *eii;
956-
(*eii)(ecx, rbml_w, ii)
955+
eii.call_mut((ecx, rbml_w, ii))
957956
}
958957

959958
const FN_FAMILY: char = 'f';

branches/auto/src/librustc_trans/trans/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2978,7 +2978,7 @@ pub fn write_metadata(cx: &SharedCrateContext, krate: &ast::Crate) -> Vec<u8> {
29782978
}
29792979

29802980
let encode_inlined_item: encoder::EncodeInlinedItem =
2981-
|ecx, rbml_w, ii| astencode::encode_inlined_item(ecx, rbml_w, ii);
2981+
box |ecx, rbml_w, ii| astencode::encode_inlined_item(ecx, rbml_w, ii);
29822982

29832983
let encode_parms = crate_ctxt_to_encode_parms(cx, encode_inlined_item);
29842984
let metadata = encoder::encode_metadata(encode_parms, krate);

0 commit comments

Comments
 (0)