diff options
| author | bors <bors@rust-lang.org> | 2014-05-10 09:56:34 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-10 09:56:34 -0700 |
| commit | 1001635dc1be7ee7c42800e7e2e537a811280c8a (patch) | |
| tree | d29a4504c7cb986152674b27a57529e8ebe431d9 /src/libcore | |
| parent | e850316408bbe6254305cf4aa7c65381dc475192 (diff) | |
| parent | 3f5e3af8387deb68e116228562062384d4b9cf65 (diff) | |
| download | rust-1001635dc1be7ee7c42800e7e2e537a811280c8a.tar.gz rust-1001635dc1be7ee7c42800e7e2e537a811280c8a.zip | |
auto merge of #14073 : alexcrichton/rust/snapshots, r=huonw
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/intrinsics.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index d7a277d3b6b..2828c9bdc23 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -137,7 +137,7 @@ pub trait TyVisitor { sz: uint, align: uint) -> bool; fn visit_enter_enum(&mut self, n_variants: uint, - get_disr: extern unsafe fn(ptr: *Opaque) -> Disr, + get_disr: unsafe extern fn(ptr: *Opaque) -> Disr, sz: uint, align: uint) -> bool; fn visit_enter_enum_variant(&mut self, variant: uint, disr_val: Disr, @@ -149,7 +149,7 @@ pub trait TyVisitor { n_fields: uint, name: &str) -> bool; fn visit_leave_enum(&mut self, n_variants: uint, - get_disr: extern unsafe fn(ptr: *Opaque) -> Disr, + get_disr: unsafe extern fn(ptr: *Opaque) -> Disr, sz: uint, align: uint) -> bool; fn visit_enter_fn(&mut self, purity: uint, proto: uint, |