diff options
Diffstat (limited to 'components/script/dom/bindings')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 24 | ||||
| -rw-r--r-- | components/script/dom/bindings/conversions.rs | 14 | ||||
| -rw-r--r-- | components/script/dom/bindings/js.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/bindings/refcounted.rs | 6 | ||||
| -rw-r--r-- | components/script/dom/bindings/str.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/bindings/trace.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/bindings/utils.rs | 10 |
7 files changed, 32 insertions, 32 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 18271a3e4ac..ebac6455b1f 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -1014,7 +1014,7 @@ class CGArgumentConverter(CGThing): seqType = CGTemplatedType("Vec", declType) variadicConversion = string.Template( - "let mut vector: ${seqType} = Vec::with_capacity((${argc} - ${index}) as uint);\n" + "let mut vector: ${seqType} = Vec::with_capacity((${argc} - ${index}) as usize);\n" "for variadicArg in range(${index}, ${argc}) {\n" "${inner}\n" " vector.push(slot);\n" @@ -1484,7 +1484,7 @@ const Class_name: [u8; %i] = %s; static Class: DOMJSClass = DOMJSClass { base: js::Class { name: &Class_name as *const u8 as *const libc::c_char, - flags: JSCLASS_IS_DOMJSCLASS | %s | (((%s) & JSCLASS_RESERVED_SLOTS_MASK) << JSCLASS_RESERVED_SLOTS_SHIFT as uint), //JSCLASS_HAS_RESERVED_SLOTS(%s), + flags: JSCLASS_IS_DOMJSCLASS | %s | (((%s) & JSCLASS_RESERVED_SLOTS_MASK) << JSCLASS_RESERVED_SLOTS_SHIFT), //JSCLASS_HAS_RESERVED_SLOTS(%s), addProperty: Some(JS_PropertyStub), delProperty: Some(JS_PropertyStub), getProperty: Some(JS_PropertyStub), @@ -1567,7 +1567,7 @@ class CGPrototypeJSClass(CGThing): const PrototypeClassName__: [u8; %s] = %s; static PrototypeClass: JSClass = JSClass { name: &PrototypeClassName__ as *const u8 as *const libc::c_char, - flags: (1 & JSCLASS_RESERVED_SLOTS_MASK) << JSCLASS_RESERVED_SLOTS_SHIFT as uint, //JSCLASS_HAS_RESERVED_SLOTS(1) + flags: (1 & JSCLASS_RESERVED_SLOTS_MASK) << JSCLASS_RESERVED_SLOTS_SHIFT, //JSCLASS_HAS_RESERVED_SLOTS(1) addProperty: Some(JS_PropertyStub), delProperty: Some(JS_PropertyStub), getProperty: Some(JS_PropertyStub), @@ -1835,7 +1835,7 @@ def CreateBindingJSObject(descriptor, parent=None): if descriptor.proxy: assert not descriptor.isGlobal() create += """ -let handler = RegisterBindings::proxy_handlers[PrototypeList::Proxies::%s as uint]; +let handler = RegisterBindings::proxy_handlers[PrototypeList::Proxies::%s as usize]; let mut private = PrivateValue(boxed::into_raw(object) as *const libc::c_void); let obj = with_compartment(cx, proto, || { NewProxyObject(cx, handler, @@ -1855,7 +1855,7 @@ assert!(!obj.is_null());\ create += """\ assert!(!obj.is_null()); -JS_SetReservedSlot(obj, DOM_OBJECT_SLOT as u32, +JS_SetReservedSlot(obj, DOM_OBJECT_SLOT, PrivateValue(boxed::into_raw(object) as *const libc::c_void));""" return create @@ -1923,7 +1923,7 @@ impl IDLInterface for ${type} { fn get_prototype_id() -> PrototypeList::ID { PrototypeList::ID::${type} } - fn get_prototype_depth() -> uint { + fn get_prototype_depth() -> usize { ${depth} } } @@ -2071,11 +2071,11 @@ assert!(((*JS_GetClass(global)).flags & JSCLASS_DOM_GLOBAL) != 0); /* Check to see whether the interface objects are already installed */ let proto_or_iface_array = get_proto_or_iface_array(global); -let cached_object: *mut JSObject = *proto_or_iface_array.offset(%s as int); +let cached_object: *mut JSObject = *proto_or_iface_array.offset(%s as isize); if cached_object.is_null() { let tmp: *mut JSObject = CreateInterfaceObjects(cx, global, receiver); assert!(!tmp.is_null()); - *proto_or_iface_array.offset(%s as int) = tmp; + *proto_or_iface_array.offset(%s as isize) = tmp; tmp } else { cached_object @@ -2800,7 +2800,7 @@ class CGEnum(CGThing): CGThing.__init__(self) decl = """\ -#[repr(uint)] +#[repr(usize)] #[derive(PartialEq, Copy)] #[jstraceable] pub enum %s { @@ -2819,7 +2819,7 @@ pub const strings: &'static [&'static str] = &[ impl ToJSValConvertible for super::%s { fn to_jsval(&self, cx: *mut JSContext) -> JSVal { - strings[*self as uint].to_jsval(cx) + strings[*self as usize].to_jsval(cx) } } """ % (",\n ".join(['"%s"' % val for val in enum.values()]), enum.identifier.name) @@ -4496,7 +4496,7 @@ class CGRegisterProxyHandlersMethod(CGAbstractMethod): def definition_body(self): return CGList([ - CGGeneric("proxy_handlers[Proxies::%s as uint] = codegen::Bindings::%sBinding::DefineProxyHandler();" % (desc.name, desc.name)) + CGGeneric("proxy_handlers[Proxies::%s as usize] = codegen::Bindings::%sBinding::DefineProxyHandler();" % (desc.name, desc.name)) for desc in self.descriptors ], "\n") @@ -5225,7 +5225,7 @@ class GlobalGenRoots(): return CGList([ CGGeneric(AUTOGENERATED_WARNING_COMMENT), - CGGeneric("pub const MAX_PROTO_CHAIN_LENGTH: uint = %d;\n\n" % config.maxProtoChainLength), + CGGeneric("pub const MAX_PROTO_CHAIN_LENGTH: usize = %d;\n\n" % config.maxProtoChainLength), CGNonNamespacedEnum('ID', protos, [0], deriving="PartialEq, Copy"), CGNonNamespacedEnum('Proxies', proxies, [0], deriving="PartialEq, Copy"), ]) diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs index e60584a6416..dfcb9b71d3f 100644 --- a/components/script/dom/bindings/conversions.rs +++ b/components/script/dom/bindings/conversions.rs @@ -62,7 +62,7 @@ pub trait IDLInterface { fn get_prototype_id() -> PrototypeList::ID; /// Returns the prototype depth, i.e., the number of interfaces this /// interface inherits from. - fn get_prototype_depth() -> uint; + fn get_prototype_depth() -> usize; } /// A trait to convert Rust types to `JSVal`s. @@ -306,7 +306,7 @@ pub fn jsstring_to_str(cx: *mut JSContext, s: *mut JSString) -> DOMString { unsafe { let mut length = 0; let chars = JS_GetStringCharsAndLength(cx, s, &mut length); - let char_vec = slice::from_raw_parts(chars, length as uint); + let char_vec = slice::from_raw_parts(chars, length as usize); String::from_utf16(char_vec).unwrap() } } @@ -365,7 +365,7 @@ impl FromJSValConvertible for ByteString { let mut length = 0; let chars = JS_GetStringCharsAndLength(cx, string, &mut length); - let char_vec = slice::from_raw_parts(chars, length as uint); + let char_vec = slice::from_raw_parts(chars, length as usize); if char_vec.iter().any(|&c| c > 0xFF) { // XXX Throw @@ -410,8 +410,8 @@ pub fn is_dom_proxy(obj: *mut JSObject) -> bool { /// stored for non-proxy bindings. // We use slot 0 for holding the raw object. This is safe for both // globals and non-globals. -pub const DOM_OBJECT_SLOT: uint = 0; -const DOM_PROXY_OBJECT_SLOT: uint = js::JSSLOT_PROXY_PRIVATE as uint; +pub const DOM_OBJECT_SLOT: u32 = 0; +const DOM_PROXY_OBJECT_SLOT: u32 = js::JSSLOT_PROXY_PRIVATE; /// Returns the index of the slot wherein a pointer to the reflected DOM object /// is stored. @@ -420,10 +420,10 @@ const DOM_PROXY_OBJECT_SLOT: uint = js::JSSLOT_PROXY_PRIVATE as uint; pub unsafe fn dom_object_slot(obj: *mut JSObject) -> u32 { let clasp = JS_GetClass(obj); if is_dom_class(&*clasp) { - DOM_OBJECT_SLOT as u32 + DOM_OBJECT_SLOT } else { assert!(is_dom_proxy(obj)); - DOM_PROXY_OBJECT_SLOT as u32 + DOM_PROXY_OBJECT_SLOT } } diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs index a842583cecb..622368af6d2 100644 --- a/components/script/dom/bindings/js.rs +++ b/components/script/dom/bindings/js.rs @@ -585,7 +585,7 @@ pub trait TemporaryPushable<T> { /// Push a new value onto this container. fn push_unrooted(&mut self, val: &T); /// Insert a new value into this container. - fn insert_unrooted(&mut self, index: uint, val: &T); + fn insert_unrooted(&mut self, index: usize, val: &T); } impl<T: Assignable<U>, U: Reflectable> TemporaryPushable<T> for Vec<JS<U>> { @@ -593,7 +593,7 @@ impl<T: Assignable<U>, U: Reflectable> TemporaryPushable<T> for Vec<JS<U>> { self.push(unsafe { val.get_js() }); } - fn insert_unrooted(&mut self, index: uint, val: &T) { + fn insert_unrooted(&mut self, index: usize, val: &T) { self.insert(index, unsafe { val.get_js() }); } } diff --git a/components/script/dom/bindings/refcounted.rs b/components/script/dom/bindings/refcounted.rs index 56e681e41dd..a0183aac59c 100644 --- a/components/script/dom/bindings/refcounted.rs +++ b/components/script/dom/bindings/refcounted.rs @@ -50,7 +50,7 @@ pub struct Trusted<T> { /// A pointer to the Rust DOM object of type T, but void to allow /// sending `Trusted<T>` between tasks, regardless of T's sendability. ptr: *const libc::c_void, - refcount: Arc<Mutex<uint>>, + refcount: Arc<Mutex<usize>>, script_chan: Box<ScriptChan + Send>, owner_thread: *const libc::c_void, } @@ -123,7 +123,7 @@ impl<T: Reflectable> Drop for Trusted<T> { /// from being garbage collected due to outstanding references. pub struct LiveDOMReferences { // keyed on pointer to Rust DOM object - table: RefCell<HashMap<*const libc::c_void, Arc<Mutex<uint>>>> + table: RefCell<HashMap<*const libc::c_void, Arc<Mutex<usize>>>> } impl LiveDOMReferences { @@ -136,7 +136,7 @@ impl LiveDOMReferences { }); } - fn addref<T: Reflectable>(&self, cx: *mut JSContext, ptr: *const T) -> Arc<Mutex<uint>> { + fn addref<T: Reflectable>(&self, cx: *mut JSContext, ptr: *const T) -> Arc<Mutex<usize>> { let mut table = self.table.borrow_mut(); match table.entry(ptr as *const libc::c_void) { Occupied(mut entry) => { diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs index 54ad9c45fb3..3c47826b023 100644 --- a/components/script/dom/bindings/str.rs +++ b/components/script/dom/bindings/str.rs @@ -34,7 +34,7 @@ impl ByteString { } /// Returns the length. - pub fn len(&self) -> uint { + pub fn len(&self) -> usize { let ByteString(ref vector) = *self; vector.len() } diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 2dfb35d3f48..ebac215ec9f 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -204,8 +204,8 @@ impl<A: JSTraceable, B: JSTraceable> JSTraceable for (A, B) { no_jsmanaged_fields!(bool, f32, f64, String, Url); -no_jsmanaged_fields!(uint, u8, u16, u32, u64); -no_jsmanaged_fields!(int, i8, i16, i32, i64); +no_jsmanaged_fields!(usize, u8, u16, u32, u64); +no_jsmanaged_fields!(isize, i8, i16, i32, i64); no_jsmanaged_fields!(Sender<T>); no_jsmanaged_fields!(Receiver<T>); no_jsmanaged_fields!(Rect<T>); diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 568d52eba46..56c9b58288d 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -335,7 +335,7 @@ pub unsafe extern fn throwing_constructor(cx: *mut JSContext, _argc: c_uint, /// Fails if the argument is not a DOM global. pub fn initialize_global(global: *mut JSObject) { let proto_array = box () - ([0 as *mut JSObject; PrototypeList::ID::Count as uint]); + ([0 as *mut JSObject; PrototypeList::ID::Count as usize]); unsafe { assert!(((*JS_GetClass(global)).flags & JSCLASS_DOM_GLOBAL) != 0); let box_ = boxed::into_raw(proto_array); @@ -460,7 +460,7 @@ pub fn get_array_index_from_id(_cx: *mut JSContext, id: jsid) -> Option<u32> { pub fn find_enum_string_index(cx: *mut JSContext, v: JSVal, values: &[&'static str]) - -> Result<Option<uint>, ()> { + -> Result<Option<usize>, ()> { unsafe { let jsstr = JS_ValueToString(cx, v); if jsstr.is_null() { @@ -474,9 +474,9 @@ pub fn find_enum_string_index(cx: *mut JSContext, } Ok(values.iter().position(|value| { - value.len() == length as uint && - range(0, length as uint).all(|j| { - value.as_bytes()[j] as u16 == *chars.offset(j as int) + value.len() == length as usize && + range(0, length as usize).all(|j| { + value.as_bytes()[j] as u16 == *chars.offset(j as isize) }) })) } |