From e4887f4ff7f5ec12f774545c6fbe3634c1f81785 Mon Sep 17 00:00:00 2001 From: Marius Seritan Date: Sun, 28 Aug 2016 13:12:26 -0700 Subject: [PATCH] Fix compile on nightly, remove warnings --- src/internal/js/class.rs | 2 +- src/internal/js/mod.rs | 2 +- src/internal/mem.rs | 2 +- src/internal/scope.rs | 2 +- src/internal/vm.rs | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/internal/js/class.rs b/src/internal/js/class.rs index 43480ae14..5a3aaccfa 100644 --- a/src/internal/js/class.rs +++ b/src/internal/js/class.rs @@ -252,7 +252,7 @@ pub trait ClassInternal: Class { let (call_callback, call_kernel) = match descriptor.call { Some(k) => k.export(), - None => (mem::transmute(ConstructorCallKernel::unimplemented::), null_mut()) + None => (mem::transmute(ConstructorCallKernel::unimplemented:: as *mut c_void), null_mut()) }; let metadata_pointer = neon_sys::class::create_base(isolate, diff --git a/src/internal/js/mod.rs b/src/internal/js/mod.rs index cc7647238..1b9e78ab7 100644 --- a/src/internal/js/mod.rs +++ b/src/internal/js/mod.rs @@ -9,7 +9,7 @@ use neon_sys; use neon_sys::raw; use neon_sys::tag::Tag; use internal::mem::{Handle, HandleInternal, Managed}; -use internal::scope::{Scope, ScopeInternal, RootScopeInternal}; +use internal::scope::{Scope, RootScopeInternal}; use internal::vm::{VmResult, Throw, JsResult, Isolate, IsolateInternal, CallbackInfo, Call, This, Kernel}; use internal::js::error::{JsError, Kind}; diff --git a/src/internal/mem.rs b/src/internal/mem.rs index 7ef9d0acd..49ccf688a 100644 --- a/src/internal/mem.rs +++ b/src/internal/mem.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use std::ops::{Deref, DerefMut}; use neon_sys; use neon_sys::raw; -use internal::js::{Value, ValueInternal, SuperType}; +use internal::js::{Value, SuperType}; use internal::js::error::{JsError, Kind}; use internal::vm::{JsResult, Lock, LockState}; use internal::scope::Scope; diff --git a/src/internal/scope.rs b/src/internal/scope.rs index 2e6fca6b2..9afdac3ad 100644 --- a/src/internal/scope.rs +++ b/src/internal/scope.rs @@ -6,7 +6,7 @@ use neon_sys; use neon_sys::raw; use internal::mem::{Handle, HandleInternal}; use internal::js::Value; -use internal::vm::{Isolate, IsolateInternal, CallbackInfo, This, Call, FunctionCall}; +use internal::vm::{Isolate, IsolateInternal}; pub trait ScopeInternal: Sized { fn isolate(&self) -> Isolate; diff --git a/src/internal/vm.rs b/src/internal/vm.rs index fd4da89fb..968623071 100644 --- a/src/internal/vm.rs +++ b/src/internal/vm.rs @@ -6,7 +6,7 @@ use std::os::raw::c_void; use cslice::CMutSlice; use neon_sys; use neon_sys::raw; -use internal::scope::{Scope, ScopeInternal, RootScope, RootScopeInternal}; +use internal::scope::{Scope, RootScope, RootScopeInternal}; use internal::js::{JsValue, Value, Object, JsObject, JsFunction}; use internal::js::class::ClassMetadata; use internal::js::error::{JsError, Kind}; @@ -61,8 +61,8 @@ impl IsolateInternal for Isolate { if ptr.is_null() { let b: Box = Box::new(ClassMap::new()); let raw = Box::into_raw(b); - ptr = unsafe { mem::transmute(raw) }; - let free_map: *mut c_void = unsafe { mem::transmute(drop_class_map) }; + ptr = unsafe { mem::transmute(raw as usize) }; + let free_map: *mut c_void = unsafe { mem::transmute(drop_class_map as usize) }; unsafe { neon_sys::class::set_class_map(self.to_raw(), ptr, free_map); } @@ -175,8 +175,8 @@ impl<'a> Module<'a> { pub fn initialize(exports: Handle, init: fn(Module) -> VmResult<()>) { let mut scope = RootScope::new(unsafe { mem::transmute(neon_sys::object::get_isolate(exports.to_raw())) }); unsafe { - let kernel: *mut c_void = mem::transmute(init); - let callback: extern "C" fn(*mut c_void, *mut c_void, *mut c_void) = mem::transmute(module_callback); + let kernel: *mut c_void = mem::transmute(init as usize); + let callback: extern "C" fn(*mut c_void, *mut c_void, *mut c_void) = mem::transmute(module_callback as usize); let exports: raw::Local = exports.to_raw(); let scope: *mut c_void = mem::transmute(&mut scope); neon_sys::module::exec_kernel(kernel, callback, exports, scope); @@ -270,7 +270,7 @@ pub trait Kernel: Sized { /// and the kernel function, both converted to raw void pointers. fn export(self) -> (*mut c_void, *mut c_void) { unsafe { - (mem::transmute(Self::callback), self.as_ptr()) + (mem::transmute(Self::callback as usize), self.as_ptr()) } } }