Rename js to value.

geovie · Jul 9, 2018 · 4280aa5 · 4280aa5
1 parent 9b0a6b3
commit 4280aa5
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 46 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -12,7 +12,7 @@ extern crate rustc_version;
 extern crate lazy_static;
 
 pub mod vm;
-pub mod js;
+pub mod value;
 pub mod thread;
 pub mod meta;
 pub mod prelude;
@@ -57,9 +57,9 @@ macro_rules! register_module {
                     dso_handle: *mut u8,
                     filename: *const u8,
                     register_func: Option<extern "C" fn(
-                        $crate::vm::Handle<$crate::js::JsObject>, *mut u8, *mut u8)>,
+                        $crate::value::Handle<$crate::value::JsObject>, *mut u8, *mut u8)>,
                     context_register_func: Option<extern "C" fn(
-                        $crate::vm::Handle<$crate::js::JsObject>, *mut u8, *mut u8, *mut u8)>,
+                        $crate::value::Handle<$crate::value::JsObject>, *mut u8, *mut u8, *mut u8)>,
                     modname: *const u8,
                     priv_data: *mut u8,
                     link: *mut __NodeModule
@@ -78,7 +78,7 @@ macro_rules! register_module {
                 };
 
                 extern "C" fn __register_neon_module(
-                        m: $crate::vm::Handle<$crate::js::JsObject>, _: *mut u8, _: *mut u8) {
+                        m: $crate::value::Handle<$crate::value::JsObject>, _: *mut u8, _: *mut u8) {
                     $crate::macro_internal::initialize_module(m, __init_neon_module);
                 }
 
@@ -109,7 +109,7 @@ macro_rules! class_definition {
                           $cname ;
                           $typ ;
                           {
-                              fn _______allocator_rust_y_u_no_hygienic_items_______($cx: $crate::vm::CallContext<$crate::js::JsUndefined>) -> $crate::vm::VmResult<$typ> {
+                              fn _______allocator_rust_y_u_no_hygienic_items_______($cx: $crate::vm::CallContext<$crate::value::JsUndefined>) -> $crate::vm::VmResult<$typ> {
                                   $body
                               }
 
@@ -131,7 +131,7 @@ macro_rules! class_definition {
                           $new_ctor ;
                           ($($mname)* $name) ;
                           ($($mdef)* {
-                              fn _______method_rust_y_u_no_hygienic_items_______($cx: $crate::vm::CallContext<$cls>) -> $crate::vm::JsResult<$crate::js::JsValue> {
+                              fn _______method_rust_y_u_no_hygienic_items_______($cx: $crate::vm::CallContext<$cls>) -> $crate::vm::JsResult<$crate::value::JsValue> {
                                   $body
                               }
 
@@ -147,7 +147,7 @@ macro_rules! class_definition {
                           $allocator ;
                           $call_ctor ;
                           ({
-                              fn _______constructor_rust_y_u_no_hygienic_items_______($cx: $crate::vm::CallContext<$cls>) -> $crate::vm::VmResult<Option<$crate::vm::Handle<$crate::js::JsObject>>> {
+                              fn _______constructor_rust_y_u_no_hygienic_items_______($cx: $crate::vm::CallContext<$cls>) -> $crate::vm::VmResult<Option<$crate::value::Handle<$crate::value::JsObject>>> {
                                   $body
                               }
 
@@ -164,7 +164,7 @@ macro_rules! class_definition {
                           $typ ;
                           $allocator ;
                           ({
-                              fn _______call_rust_y_u_no_hygienic_items_______($cx: $crate::vm::CallContext<$crate::js::JsValue>) -> $crate::vm::JsResult<$crate::js::JsValue> {
+                              fn _______call_rust_y_u_no_hygienic_items_______($cx: $crate::vm::CallContext<$crate::value::JsValue>) -> $crate::vm::JsResult<$crate::value::JsValue> {
                                   $body
                               }
 
@@ -177,10 +177,10 @@ macro_rules! class_definition {
     };
 
     ( $cls:ident ; $cname:ident ; $typ:ty ; $allocator:block ; ($($call_ctor:block)*) ; ($($new_ctor:block)*) ; ($($mname:ident)*) ; ($($mdef:block)*) ; $($rest:tt)* ) => {
-        impl $crate::js::Class for $cls {
+        impl $crate::value::Class for $cls {
             type Internals = $typ;
 
-            fn setup<'a, C: $crate::vm::Context<'a>>(_: &mut C) -> $crate::vm::VmResult<$crate::js::ClassDescriptor<'a, Self>> {
+            fn setup<'a, C: $crate::vm::Context<'a>>(_: &mut C) -> $crate::vm::VmResult<$crate::value::ClassDescriptor<'a, Self>> {
                 ::std::result::Result::Ok(Self::describe(stringify!($cname), $allocator)
                                              $(.construct($new_ctor))*
                                              $(.call($call_ctor))*
@@ -194,7 +194,7 @@ macro_rules! class_definition {
 #[macro_export]
 macro_rules! impl_managed {
     ($cls:ident) => {
-        impl $crate::vm::Managed for $cls {
+        impl $crate::value::Managed for $cls {
             fn to_raw(self) -> $crate::macro_internal::runtime::raw::Local {
                 let $cls(raw) = self;
                 raw

diff --git a/src/macro_internal/mod.rs b/src/macro_internal/mod.rs
@@ -2,7 +2,7 @@
 /// but are subject to change and should never be explicitly used.
 
 // Used by the class macro.
-pub use js::class::internal::{AllocateCallback, ConstructCallback, ConstructorCallCallback, MethodCallback};
+pub use value::class::internal::{AllocateCallback, ConstructCallback, ConstructorCallCallback, MethodCallback};
 pub use vm::internal::initialize_module;
 
 // An alias for neon_runtime so macros can refer to it.

diff --git a/src/prelude.rs b/src/prelude.rs
@@ -1,4 +1,4 @@
 //! The Neon "prelude," a re-exported collection of the most commonly-used Neon APIs.
 
-pub use js::{Handle, JsBuffer, JsArrayBuffer, BinaryData, Class, JsError, ErrorKind, Value, JsValue, JsUndefined, JsNull, JsBoolean, JsString, ToJsString, JsNumber, JsObject, Object, JsArray, JsFunction, Borrow, BorrowMut};
+pub use value::{Handle, JsBuffer, JsArrayBuffer, BinaryData, Class, JsError, ErrorKind, Value, JsValue, JsUndefined, JsNull, JsBoolean, JsString, ToJsString, JsNumber, JsObject, Object, JsArray, JsFunction, Borrow, BorrowMut};
 pub use vm::{VmResult, JsResult, JsResultExt, CallKind, Context, ModuleContext, ExecuteContext, ComputeContext, CallContext, FunctionContext, MethodContext};
diff --git a/src/thread/mod.rs b/src/thread/mod.rs
@@ -4,8 +4,8 @@ use std::marker::{Send, Sized};
 use std::mem;
 use std::os::raw::c_void;
 
-use js::{Value, JsFunction};
-use js::mem::{Handle, Managed};
+use value::{Value, JsFunction};
+use value::mem::{Handle, Managed};
 use vm::{TaskContext, JsResult};
 use neon_runtime;
 use neon_runtime::raw;

diff --git a/src/js/binary.rs → src/value/binary.rs b/src/js/binary.rs → src/value/binary.rs
@@ -5,9 +5,9 @@ use std::mem;
 use std::os::raw::c_void;
 use std::slice;
 use vm::{Context, JsResult};
-use js::{Value, Object, Borrow, BorrowMut, Ref, RefMut, LoanError, build};
-use js::mem::Managed;
-use js::internal::ValueInternal;
+use value::{Value, Object, Borrow, BorrowMut, Ref, RefMut, LoanError, build};
+use value::mem::Managed;
+use value::internal::ValueInternal;
 use vm::VmGuard;
 use vm::internal::Pointer;
 use neon_runtime;
@@ -117,9 +117,9 @@ impl<'a> BinaryData<'a> {
     /// # Example:
     /// 
     /// ```no_run
-    /// use neon::js::JsArrayBuffer;
+    /// use neon::value::JsArrayBuffer;
     /// use neon::vm::{Context, Handle};
-    /// # use neon::js::JsUndefined;
+    /// # use neon::value::JsUndefined;
     /// # use neon::vm::{JsResult, FunctionContext};
     /// # fn get_x_and_y(mut cx: FunctionContext) -> JsResult<JsUndefined> {
     /// 
@@ -143,9 +143,9 @@ impl<'a> BinaryData<'a> {
     /// # Example:
     /// 
     /// ```no_run
-    /// use neon::js::JsArrayBuffer;
+    /// use neon::value::JsArrayBuffer;
     /// use neon::vm::{Context, Handle};
-    /// # use neon::js::JsUndefined;
+    /// # use neon::value::JsUndefined;
     /// # use neon::vm::{JsResult, FunctionContext};
     /// # fn modify_buffer(mut cx: FunctionContext) -> JsResult<JsUndefined> {
     /// 

diff --git a/src/js/class.rs → src/value/class.rs b/src/js/class.rs → src/value/class.rs
@@ -8,8 +8,8 @@ use neon_runtime;
 use neon_runtime::raw;
 use vm::{JsResult, VmResult, Throw, This, Context, VmGuard, Callback};
 use vm::internal::Isolate;
-use js::{Value, JsFunction, Object, JsValue, Handle, Managed, Borrow, BorrowMut, Ref, RefMut, LoanError, build};
-use js::internal::ValueInternal;
+use value::{Value, JsFunction, Object, JsValue, Handle, Managed, Borrow, BorrowMut, Ref, RefMut, LoanError, build};
+use value::internal::ValueInternal;
 use self::internal::{ClassMetadata, MethodCallback, ConstructorCallCallback, AllocateCallback, ConstructCallback};
 
 pub(crate) mod internal {
@@ -19,10 +19,10 @@ pub(crate) mod internal {
     use neon_runtime;
     use neon_runtime::raw;
     use super::{Class, ClassInternal};
-    use js::{JsValue, JsObject, JsFunction, JsUndefined, Handle, Managed, build};
+    use value::{JsValue, JsObject, JsFunction, JsUndefined, Handle, Managed, build};
     use vm::{JsResult, VmResult, CallbackInfo, Callback, CallContext, Context, Throw};
     use vm::internal::ContextInternal;
-    use js::error::convert_panics;
+    use value::error::convert_panics;
 
     #[repr(C)]
     pub struct MethodCallback<T: Class>(pub fn(CallContext<T>) -> JsResult<JsValue>);

diff --git a/src/js/error.rs → src/value/error.rs b/src/js/error.rs → src/value/error.rs
@@ -8,8 +8,8 @@ use neon_runtime;
 use neon_runtime::raw;
 
 use vm::{Throw, Context, VmResult};
-use js::{Value, Object, ToJsString, Handle, Managed, build};
-use js::internal::ValueInternal;
+use value::{Value, Object, ToJsString, Handle, Managed, build};
+use value::internal::ValueInternal;
 
 /// A JS `Error` object.
 #[repr(C)]

diff --git a/src/js/mem.rs → src/value/mem.rs b/src/js/mem.rs → src/value/mem.rs
@@ -6,9 +6,9 @@ use std::error::Error;
 use std::fmt::{self, Debug, Display};
 use neon_runtime;
 use neon_runtime::raw;
-use js::Value;
-use js::internal::SuperType;
-use js::error::{JsError, ErrorKind};
+use value::Value;
+use value::internal::SuperType;
+use value::error::{JsError, ErrorKind};
 use vm::{Context, JsResult, JsResultExt};
 
 /// The trait of data that is managed by the JS garbage collector and can only be accessed via handles.
@@ -105,8 +105,8 @@ impl<'a, T: Value> Handle<'a, T> {
     /// # Example:
     /// 
     /// ```no_run
-    /// use neon::js::{JsValue, JsString, JsNumber};
-    /// # use neon::js::JsUndefined;
+    /// use neon::value::{JsValue, JsString, JsNumber};
+    /// # use neon::value::JsUndefined;
     /// # use neon::vm::{JsResult, FunctionContext};
     /// # use neon::vm::Context;
     /// use neon::vm::Handle;

diff --git a/src/js/mod.rs → src/value/mod.rs b/src/js/mod.rs → src/value/mod.rs
@@ -27,8 +27,8 @@ pub(crate) mod internal {
     use neon_runtime;
     use neon_runtime::raw;
     use vm::{JsResult, CallbackInfo, FunctionContext, Callback};
-    use js::error::convert_panics;
-    use js::{JsObject, Handle, Managed};
+    use value::error::convert_panics;
+    use value::{JsObject, Handle, Managed};
     use super::Value;
 
     pub trait ValueInternal: Managed + 'static {

diff --git a/src/vm/mod.rs b/src/vm/mod.rs
@@ -13,12 +13,12 @@ use std::panic::UnwindSafe;
 use neon_runtime;
 use neon_runtime::raw;
 use neon_runtime::call::CCallback;
-use js::{JsValue, Value, Object, JsObject, JsArray, JsFunction, JsBoolean, JsNumber, JsString, StringResult, JsNull, JsUndefined, Ref, RefMut, Borrow, BorrowMut};
-use js::mem::{Managed, Handle};
-use js::binary::{JsArrayBuffer, JsBuffer};
-use js::class::internal::ClassMetadata;
-use js::class::Class;
-use js::error::{JsError, ErrorKind};
+use value::{JsValue, Value, Object, JsObject, JsArray, JsFunction, JsBoolean, JsNumber, JsString, StringResult, JsNull, JsUndefined, Ref, RefMut, Borrow, BorrowMut};
+use value::mem::{Managed, Handle};
+use value::binary::{JsArrayBuffer, JsBuffer};
+use value::class::internal::ClassMetadata;
+use value::class::Class;
+use value::error::{JsError, ErrorKind};
 use self::internal::{Ledger, ContextInternal, Scope, ScopeMetadata};
 
 pub(crate) mod internal {
@@ -29,9 +29,9 @@ pub(crate) mod internal {
     use neon_runtime;
     use neon_runtime::raw;
     use neon_runtime::scope::Root;
-    use js::mem::Handle;
+    use value::mem::Handle;
     use vm::VmResult;
-    use js::{JsObject, LoanError};
+    use value::{JsObject, LoanError};
     use super::{ClassMap, ModuleContext};
 
     pub unsafe trait Pointer {
@@ -365,7 +365,7 @@ pub trait Context<'a>: ContextInternal<'a> {
     /// # Example:
     /// 
     /// ```no_run
-    /// use neon::js::{JsNumber, Borrow, Ref, JsArrayBuffer};
+    /// use neon::value::{JsNumber, Borrow, Ref, JsArrayBuffer};
     /// # use neon::vm::{JsResult, FunctionContext};
     /// use neon::vm::{Context, Handle};
     /// 
@@ -397,8 +397,8 @@ pub trait Context<'a>: ContextInternal<'a> {
     /// # Example:
     /// 
     /// ```no_run
-    /// use neon::js::{BorrowMut, RefMut, JsArrayBuffer};
-    /// # use neon::js::JsUndefined;
+    /// use neon::value::{BorrowMut, RefMut, JsArrayBuffer};
+    /// # use neon::value::JsUndefined;
     /// # use neon::vm::{JsResult, FunctionContext};
     /// use neon::vm::{Context, Handle};
     ///