Skip to content

Commit d3d5c6c

Browse files
committed
---
yaml --- r: 54779 b: refs/heads/snap-stage3 c: 2793e49 h: refs/heads/master i: 54777: 2952c7e 54775: 64c523a v: v3
1 parent 4bf4f93 commit d3d5c6c

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
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: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: f86bf0ee6ecddcbcf220a376b16311d9a5115448
4+
refs/heads/snap-stage3: 2793e4962291c02839253b6212b0b9a02b7686e4
55
refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,4 @@ config.stamp
8686
.DS_Store
8787
src/etc/dl
8888
.settings/
89+
build/

branches/snap-stage3/src/libcore/repr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ use io::{Writer, WriterUtil};
2323
use libc::c_void;
2424
use managed;
2525
use ptr;
26-
#[cfg(stage0)] use sys;
2726
use reflect;
2827
use reflect::{MovePtr, align};
28+
use sys;
2929
use to_str::ToStr;
3030
use vec::UnboxedVecRepr;
3131
use vec::raw::{VecRepr, SliceRepr};
@@ -479,7 +479,7 @@ impl TyVisitor for ReprVisitor {
479479
}
480480

481481
#[cfg(not(stage0))]
482-
fn visit_enter_enum(&self, _n_variants: uint,
482+
fn visit_enter_enum(&self, n_variants: uint,
483483
get_disr: extern unsafe fn(ptr: *Opaque) -> int,
484484
_sz: uint, _align: uint) -> bool {
485485
let disr = unsafe { get_disr(transmute(self.ptr)) };

0 commit comments

Comments
 (0)