From eb0900742aa3bfcca2a13eebb5ab669ce086829a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Andrasek?= Date: Thu, 30 Oct 2014 20:10:26 +0100 Subject: [PATCH] remove managed_boxes, static => const --- src/glue.rs | 2 +- src/jsapi.rs | 98 ++++++++++++++++++++++++++-------------------------- src/jsval.rs | 20 +++++------ src/lib.rs | 86 ++++++++++++++++++++++----------------------- 4 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/glue.rs b/src/glue.rs index 8decabc1d..8b61bc928 100644 --- a/src/glue.rs +++ b/src/glue.rs @@ -9,7 +9,7 @@ use jsapi::*; use jsfriendapi::JSJitInfo; use jsval::JSVal; -pub static JS_STRUCTURED_CLONE_VERSION: u32 = 1; +pub const JS_STRUCTURED_CLONE_VERSION: u32 = 1; pub struct ProxyTraps { pub getPropertyDescriptor: Option bool>, diff --git a/src/jsapi.rs b/src/jsapi.rs index a2c27b55a..99569d47f 100644 --- a/src/jsapi.rs +++ b/src/jsapi.rs @@ -24,7 +24,7 @@ pub type JSCallOnceType = JSBool; pub type JSInitCallback = *mut u8; pub type JSProtoKey = c_uint; -pub static JSProto_LIMIT: JSProtoKey = 41; +pub const JSProto_LIMIT: JSProtoKey = 41; #[repr(u32)] pub enum JSVersion { @@ -69,7 +69,7 @@ pub enum JSGCTraceKind { JSTRACE_SCRIPT = 2, } -pub static JS_DEFAULT_ZEAL_FREQ: u32 = 100; +pub const JS_DEFAULT_ZEAL_FREQ: u32 = 100; pub type moz_static_assert6 = [c_int, ..1u]; pub struct JSHandleObject { @@ -148,23 +148,23 @@ pub type JSNative = Option JSBool>; pub type Enum_JSContextOp = c_uint; -pub static JSCONTEXT_NEW: c_uint = 0; -pub static JSCONTEXT_DESTROY: c_uint = 1; +pub const JSCONTEXT_NEW: c_uint = 0; +pub const JSCONTEXT_DESTROY: c_uint = 1; pub type JSContextOp = Enum_JSContextOp; pub type JSContextCallback = Option JSBool>; pub type Enum_JSGCStatus = c_uint; -pub static JSGC_BEGIN: c_uint = 0; -pub static JSGC_END: c_uint = 1; +pub const JSGC_BEGIN: c_uint = 0; +pub const JSGC_END: c_uint = 1; pub type JSGCStatus = Enum_JSGCStatus; pub type JSGCCallback = Option; pub type Enum_JSFinalizeStatus = c_uint; -pub static JSFINALIZE_START: c_uint = 0; -pub static JSFINALIZE_END: c_uint = 1; +pub const JSFINALIZE_START: c_uint = 0; +pub const JSFINALIZE_END: c_uint = 1; pub type JSFinalizeStatus = Enum_JSFinalizeStatus; pub type JSFinalizeCallback = Option; pub type Enum_JSExnType = c_int; -pub static JSEXN_NONE: c_int = -1; -pub static JSEXN_ERR: c_int = 0; -pub static JSEXN_INTERNALERR: c_int = 1; -pub static JSEXN_EVALERR: c_int = 2; -pub static JSEXN_RANGEERR: c_int = 3; -pub static JSEXN_REFERENCEERR: c_int = 4; -pub static JSEXN_SYNTAXERR: c_int = 5; -pub static JSEXN_TYPEERR: c_int = 6; -pub static JSEXN_URIERR: c_int = 7; -pub static JSEXN_LIMIT: c_int = 8; +pub const JSEXN_NONE: c_int = -1; +pub const JSEXN_ERR: c_int = 0; +pub const JSEXN_INTERNALERR: c_int = 1; +pub const JSEXN_EVALERR: c_int = 2; +pub const JSEXN_RANGEERR: c_int = 3; +pub const JSEXN_REFERENCEERR: c_int = 4; +pub const JSEXN_SYNTAXERR: c_int = 5; +pub const JSEXN_TYPEERR: c_int = 6; +pub const JSEXN_URIERR: c_int = 7; +pub const JSEXN_LIMIT: c_int = 8; pub type JSExnType = Enum_JSExnType; pub struct JSErrorFormatString { pub format: *const c_char, @@ -256,8 +256,8 @@ pub type JSEnumerateDiagnosticMemoryCallback = (arg1: *mut c_void, arg2: size_t) -> JSBool>; pub type Enum_JSGCRootType = c_uint; -pub static JS_GC_ROOT_VALUE_PTR: c_uint = 0; -pub static JS_GC_ROOT_GCTHING_PTR: c_uint = 1; +pub const JS_GC_ROOT_VALUE_PTR: c_uint = 0; +pub const JS_GC_ROOT_GCTHING_PTR: c_uint = 1; pub type JSGCRootType = Enum_JSGCRootType; pub type JSGCRootMapFun = Option; pub struct JSClass { @@ -369,8 +369,8 @@ pub struct JSSecurityCallbacks { pub contentSecurityPolicyAllows: JSCSPEvalChecker, } pub type Enum_JSExecPart = c_uint; -pub static JSEXEC_PROLOG: c_uint = 0; -pub static JSEXEC_MAIN: c_uint = 1; +pub const JSEXEC_PROLOG: c_uint = 0; +pub const JSEXEC_MAIN: c_uint = 1; pub type JSExecPart = Enum_JSExecPart; pub type JSONWriteCallback = Option JSBool; diff --git a/src/jsval.rs b/src/jsval.rs index aebac3e8e..8c1b7a242 100644 --- a/src/jsval.rs +++ b/src/jsval.rs @@ -8,7 +8,7 @@ use libc::c_void; use std::mem; #[cfg(target_word_size = "64")] -static JSVAL_TAG_SHIFT: uint = 47u; +const JSVAL_TAG_SHIFT: uint = 47u; #[repr(u8)] enum ValueType { @@ -27,10 +27,10 @@ enum ValueType { } #[cfg(target_word_size = "64")] -static JSVAL_TAG_MAX_DOUBLE: u32 = 0x1FFF0u32; +const JSVAL_TAG_MAX_DOUBLE: u32 = 0x1FFF0u32; #[cfg(target_word_size = "32")] -static JSVAL_TAG_CLEAR: u32 = 0xFFFFFF80; +const JSVAL_TAG_CLEAR: u32 = 0xFFFFFF80; #[cfg(target_word_size = "64")] #[repr(u32)] @@ -73,7 +73,7 @@ enum ValueShiftedTag { #[cfg(target_word_size = "64")] -static JSVAL_PAYLOAD_MASK: u64 = 0x00007FFFFFFFFFFF; +const JSVAL_PAYLOAD_MASK: u64 = 0x00007FFFFFFFFFFF; // JSVal was originally type of u64. // now this become {u64} because of the union abi issue on ARM arch. See #398. @@ -252,13 +252,13 @@ impl JSVal { #[cfg(target_word_size = "64")] pub fn is_primitive(&self) -> bool { - static JSVAL_UPPER_EXCL_SHIFTED_TAG_OF_PRIMITIVE_SET: u64 = JSVAL_SHIFTED_TAG_OBJECT as u64; + const JSVAL_UPPER_EXCL_SHIFTED_TAG_OF_PRIMITIVE_SET: u64 = JSVAL_SHIFTED_TAG_OBJECT as u64; self.v < JSVAL_UPPER_EXCL_SHIFTED_TAG_OF_PRIMITIVE_SET } #[cfg(target_word_size = "32")] pub fn is_primitive(&self) -> bool { - static JSVAL_UPPER_EXCL_TAG_OF_PRIMITIVE_SET: u64 = JSVAL_TAG_OBJECT as u64; + const JSVAL_UPPER_EXCL_TAG_OF_PRIMITIVE_SET: u64 = JSVAL_TAG_OBJECT as u64; (self.v >> 32) < JSVAL_UPPER_EXCL_TAG_OF_PRIMITIVE_SET } @@ -301,14 +301,14 @@ impl JSVal { #[cfg(target_word_size = "64")] pub fn is_object_or_null(&self) -> bool { - static JSVAL_LOWER_INCL_SHIFTED_TAG_OF_OBJ_OR_NULL_SET: u64 = JSVAL_SHIFTED_TAG_NULL as u64; + const JSVAL_LOWER_INCL_SHIFTED_TAG_OF_OBJ_OR_NULL_SET: u64 = JSVAL_SHIFTED_TAG_NULL as u64; assert!((self.v >> JSVAL_TAG_SHIFT) <= JSVAL_TAG_OBJECT as u64); self.v >= JSVAL_LOWER_INCL_SHIFTED_TAG_OF_OBJ_OR_NULL_SET } #[cfg(target_word_size = "32")] pub fn is_object_or_null(&self) -> bool { - static JSVAL_LOWER_INCL_TAG_OF_OBJ_OR_NULL_SET: u64 = JSVAL_TAG_NULL as u64; + const JSVAL_LOWER_INCL_TAG_OF_OBJ_OR_NULL_SET: u64 = JSVAL_TAG_NULL as u64; assert!((self.v >> 32) <= JSVAL_TAG_OBJECT as u64); (self.v >> 32) >= JSVAL_LOWER_INCL_TAG_OF_OBJ_OR_NULL_SET } @@ -343,13 +343,13 @@ impl JSVal { #[cfg(target_word_size = "64")] pub fn is_gcthing(&self) -> bool { - static JSVAL_LOWER_INCL_SHIFTED_TAG_OF_GCTHING_SET: u64 = JSVAL_SHIFTED_TAG_STRING as u64; + const JSVAL_LOWER_INCL_SHIFTED_TAG_OF_GCTHING_SET: u64 = JSVAL_SHIFTED_TAG_STRING as u64; self.v >= JSVAL_LOWER_INCL_SHIFTED_TAG_OF_GCTHING_SET } #[cfg(target_word_size = "32")] pub fn is_gcthing(&self) -> bool { - static JSVAL_LOWER_INCL_TAG_OF_GCTHING_SET: u64 = JSVAL_TAG_STRING as u64; + const JSVAL_LOWER_INCL_TAG_OF_GCTHING_SET: u64 = JSVAL_TAG_STRING as u64; (self.v >> 32) >= JSVAL_LOWER_INCL_TAG_OF_GCTHING_SET } diff --git a/src/lib.rs b/src/lib.rs index 7340062ff..6daec9f41 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,7 +5,7 @@ #![crate_name = "js"] #![crate_type = "rlib"] -#![feature(globs, link_args, managed_boxes, phase, unsafe_destructor)] +#![feature(globs, link_args, phase, unsafe_destructor)] #![allow(non_uppercase_statics, non_camel_case_types, non_snake_case, ctypes)] @@ -47,53 +47,53 @@ pub mod jsval; pub mod jsfriendapi; // FIXME: Add the remaining options -pub static JSOPTION_STRICT: uint32_t = 0b00000000000001u32; -pub static JSOPTION_WERROR: uint32_t = 0b00000000000010u32; -pub static JSOPTION_VAROBJFIX: uint32_t = 0b00000000000100u32; -pub static JSOPTION_METHODJIT: uint32_t = (1u32 << 14) as u32; -pub static JSOPTION_TYPE_INFERENCE: uint32_t = (1u32 << 18) as u32; - -pub static default_heapsize: u32 = 32_u32 * 1024_u32 * 1024_u32; -pub static default_stacksize: uint = 8192u; -pub static ERR: JSBool = 0_i32; - -pub static JSID_TYPE_STRING: i64 = 0; -pub static JSID_TYPE_INT: i64 = 1; -pub static JSID_TYPE_VOID: i64 = 2; -pub static JSID_TYPE_OBJECT: i64 = 4; -pub static JSID_TYPE_DEFAULT_XML_NAMESPACE: i64 = 6; -pub static JSID_TYPE_MASK: i64 = 7; - -pub static JSID_VOID: jsid = JSID_TYPE_VOID as jsid; - -pub static JSFUN_CONSTRUCTOR: u32 = 0x200; /* native that can be called as a ctor */ - -pub static JSPROP_ENUMERATE: c_uint = 0x01; -pub static JSPROP_READONLY: c_uint = 0x02; -pub static JSPROP_PERMANENT: c_uint = 0x04; -pub static JSPROP_GETTER: c_uint = 0x10; -pub static JSPROP_SETTER: c_uint = 0x20; -pub static JSPROP_SHARED: c_uint = 0x40; -pub static JSPROP_NATIVE_ACCESSORS: c_uint = 0x08; - -pub static JSCLASS_RESERVED_SLOTS_SHIFT: c_uint = 8; -pub static JSCLASS_RESERVED_SLOTS_WIDTH: c_uint = 8; -pub static JSCLASS_RESERVED_SLOTS_MASK: c_uint = ((1u << JSCLASS_RESERVED_SLOTS_WIDTH as uint) - 1) as c_uint; - -pub static JSCLASS_HIGH_FLAGS_SHIFT: c_uint = +pub const JSOPTION_STRICT: uint32_t = 0b00000000000001u32; +pub const JSOPTION_WERROR: uint32_t = 0b00000000000010u32; +pub const JSOPTION_VAROBJFIX: uint32_t = 0b00000000000100u32; +pub const JSOPTION_METHODJIT: uint32_t = (1u32 << 14) as u32; +pub const JSOPTION_TYPE_INFERENCE: uint32_t = (1u32 << 18) as u32; + +pub const default_heapsize: u32 = 32_u32 * 1024_u32 * 1024_u32; +pub const default_stacksize: uint = 8192u; +pub const ERR: JSBool = 0_i32; + +pub const JSID_TYPE_STRING: i64 = 0; +pub const JSID_TYPE_INT: i64 = 1; +pub const JSID_TYPE_VOID: i64 = 2; +pub const JSID_TYPE_OBJECT: i64 = 4; +pub const JSID_TYPE_DEFAULT_XML_NAMESPACE: i64 = 6; +pub const JSID_TYPE_MASK: i64 = 7; + +pub const JSID_VOID: jsid = JSID_TYPE_VOID as jsid; + +pub const JSFUN_CONSTRUCTOR: u32 = 0x200; /* native that can be called as a ctor */ + +pub const JSPROP_ENUMERATE: c_uint = 0x01; +pub const JSPROP_READONLY: c_uint = 0x02; +pub const JSPROP_PERMANENT: c_uint = 0x04; +pub const JSPROP_GETTER: c_uint = 0x10; +pub const JSPROP_SETTER: c_uint = 0x20; +pub const JSPROP_SHARED: c_uint = 0x40; +pub const JSPROP_NATIVE_ACCESSORS: c_uint = 0x08; + +pub const JSCLASS_RESERVED_SLOTS_SHIFT: c_uint = 8; +pub const JSCLASS_RESERVED_SLOTS_WIDTH: c_uint = 8; +pub const JSCLASS_RESERVED_SLOTS_MASK: c_uint = ((1u << JSCLASS_RESERVED_SLOTS_WIDTH as uint) - 1) as c_uint; + +pub const JSCLASS_HIGH_FLAGS_SHIFT: c_uint = JSCLASS_RESERVED_SLOTS_SHIFT + JSCLASS_RESERVED_SLOTS_WIDTH; -pub static JSCLASS_IS_GLOBAL: c_uint = (1<<((JSCLASS_HIGH_FLAGS_SHIFT as uint)+1)); +pub const JSCLASS_IS_GLOBAL: c_uint = (1<<((JSCLASS_HIGH_FLAGS_SHIFT as uint)+1)); -pub static JSCLASS_GLOBAL_SLOT_COUNT: c_uint = JSProto_LIMIT * 3 + 24; +pub const JSCLASS_GLOBAL_SLOT_COUNT: c_uint = JSProto_LIMIT * 3 + 24; -pub static JSCLASS_IS_DOMJSCLASS: u32 = 1 << 4; -pub static JSCLASS_USERBIT1: u32 = 1 << 7; +pub const JSCLASS_IS_DOMJSCLASS: u32 = 1 << 4; +pub const JSCLASS_USERBIT1: u32 = 1 << 7; -pub static JSSLOT_PROXY_PRIVATE: u32 = 1; +pub const JSSLOT_PROXY_PRIVATE: u32 = 1; -pub static JSRESOLVE_QUALIFIED: u32 = 0x01; -pub static JSRESOLVE_ASSIGNING: u32 = 0x02; -pub static JSRESOLVE_DETECTING: u32 = 0x04; +pub const JSRESOLVE_QUALIFIED: u32 = 0x01; +pub const JSRESOLVE_ASSIGNING: u32 = 0x02; +pub const JSRESOLVE_DETECTING: u32 = 0x04; pub enum JSGCTraceKind { JSTRACE_OBJECT,