Rename vm to cx.

src/borrow/mod.rs

@@ -2,7 +2,7 @@ use std::ops::{Deref, DerefMut, Drop};
 use std::fmt;
 use std::os::raw::c_void;
 
-use vm::VmGuard;
+use cx::VmGuard;
 use self::internal::Pointer;
 
 pub(crate) mod internal {

src/lib.rs

@@ -11,7 +11,7 @@ extern crate rustc_version;
 #[macro_use]
 extern crate lazy_static;
 
-pub mod vm;
+pub mod cx;
 pub mod value;
 pub mod object;
 pub mod borrow;

src/macro_internal/mod.rs

@@ -3,7 +3,7 @@
 
 // Used by the class macro.
 pub use object::class::internal::{AllocateCallback, ConstructCallback, ConstructorCallCallback, MethodCallback};
-pub use vm::internal::initialize_module;
+pub use cx::internal::initialize_module;
 
 // An alias for neon_runtime so macros can refer to it.
 pub mod runtime {

src/object/class/mod.rs

@@ -7,8 +7,8 @@ use std::slice;
 use neon_runtime;
 use neon_runtime::raw;
 use neon_runtime::call::CCallback;
-use vm::{Context, VmGuard, CallbackInfo};
-use vm::internal::Isolate;
+use cx::{Context, VmGuard, CallbackInfo};
+use cx::internal::Isolate;
 use result::{NeonResult, Throw};
 use borrow::{Borrow, BorrowMut, Ref, RefMut, LoanError};
 use value::{JsResult, Value, JsFunction, JsValue, Handle, Managed, build};
@@ -24,8 +24,8 @@ pub(crate) mod internal {
     use neon_runtime::raw;
     use super::{Class, ClassInternal, Callback};
     use value::{JsResult, JsValue, JsObject, JsFunction, JsUndefined, Handle, Managed, build};
-    use vm::{CallbackInfo, CallContext, Context};
-    use vm::internal::ContextInternal;
+    use cx::{CallbackInfo, CallContext, Context};
+    use cx::internal::ContextInternal;
     use result::{NeonResult, Throw};
     use value::error::convert_panics;
 

src/object/mod.rs

@@ -3,7 +3,7 @@ pub(crate) mod class;
 use neon_runtime;
 use neon_runtime::raw;
 use value::{Handle, Managed, JsResult, Value, JsValue, JsArray, lower_str_unwrap, build};
-use vm::Context;
+use cx::Context;
 use result::{NeonResult, Throw};
 
 pub use self::class::{Class, ClassDescriptor};

src/prelude.rs

@@ -3,5 +3,5 @@
 pub use value::{Handle, JsResult, JsBuffer, JsArrayBuffer, BinaryData, JsError, ErrorKind, Value, JsValue, JsUndefined, JsNull, JsBoolean, JsString, ToJsString, JsNumber, JsObject, JsArray, JsFunction};
 pub use object::{Object, Class};
 pub use borrow::{Borrow, BorrowMut};
-pub use vm::{CallKind, Context, ModuleContext, ExecuteContext, ComputeContext, CallContext, FunctionContext, MethodContext};
+pub use cx::{CallKind, Context, ModuleContext, ExecuteContext, ComputeContext, CallContext, FunctionContext, MethodContext};
 pub use result::{NeonResult, ResultExt};

src/result/mod.rs

@@ -1,7 +1,7 @@
 use std::error::Error;
 use std::fmt::{Display, Formatter, Result as FmtResult};
 use value::{JsResult, Value};
-use vm::Context;
+use cx::Context;
 
 /// An error sentinel type used by `VmResult` (and `JsResult`) to indicate that the JS VM has entered into a throwing state.
 #[derive(Debug)]

src/thread/mod.rs

@@ -6,7 +6,7 @@ use std::os::raw::c_void;
 
 use value::{JsResult, Value, JsFunction};
 use value::mem::{Handle, Managed};
-use vm::TaskContext;
+use cx::TaskContext;
 use neon_runtime;
 use neon_runtime::raw;
 

src/value/binary.rs

@@ -4,13 +4,12 @@ use std::marker::PhantomData;
 use std::mem;
 use std::os::raw::c_void;
 use std::slice;
-use vm::Context;
+use cx::{Context, VmGuard};
 use borrow::{Borrow, BorrowMut, Ref, RefMut, LoanError};
 use borrow::internal::Pointer;
 use value::{JsResult, Value, Object, build};
 use value::mem::Managed;
 use value::internal::ValueInternal;
-use vm::VmGuard;
 use neon_runtime;
 use neon_runtime::raw;
 

src/value/error.rs

@@ -7,7 +7,7 @@ use std::panic::{UnwindSafe, catch_unwind};
 use neon_runtime;
 use neon_runtime::raw;
 
-use vm::Context;
+use cx::Context;
 use result::{NeonResult, Throw};
 use value::{Value, Object, ToJsString, Handle, Managed, build};
 use value::internal::ValueInternal;

src/value/mem.rs

@@ -9,7 +9,7 @@ use neon_runtime::raw;
 use value::{JsResult, Value};
 use value::internal::SuperType;
 use value::error::{JsError, ErrorKind};
-use vm::Context;
+use cx::Context;
 use result::ResultExt;
 
 /// The trait of data that is managed by the JS garbage collector and can only be accessed via handles.

src/value/mod.rs

@@ -10,8 +10,8 @@ use std::os::raw::c_void;
 use std::marker::PhantomData;
 use neon_runtime;
 use neon_runtime::raw;
-use vm::{Context, FunctionContext};
-use vm::internal::Isolate;
+use cx::{Context, FunctionContext};
+use cx::internal::Isolate;
 use result::{NeonResult, Throw, ResultExt};
 use object::{Object, This};
 use object::class::Callback;
@@ -26,7 +26,7 @@ pub(crate) mod internal {
     use std::os::raw::c_void;
     use neon_runtime;
     use neon_runtime::raw;
-    use vm::{CallbackInfo, FunctionContext};
+    use cx::{CallbackInfo, FunctionContext};
     use value::error::convert_panics;
     use value::{JsObject, Handle, Managed};
     use object::class::Callback;