auto merge of #4979 : Ms2ger/servo/audit-ints, r=Manishearth

1 files changed, 12 insertions, 12 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"),
         ])