diff --git a/mk/rustpkg.mk b/mk/rustpkg.mk index 2088f03ac7e..e2b5eaafe30 100644 --- a/mk/rustpkg.mk +++ b/mk/rustpkg.mk @@ -12,11 +12,11 @@ DO_CLEAN_$(1) = rm -rf $$(DONE_$(1)) $(CFG_BUILD_HOME)/workspace/build/$(CFG_TAR EXTRA_RFLAGS_$(1) = -ifeq ($(shell uname -s),Darwin) -ifeq ($(shell sw_vers | grep -c 10.6),1) +ifeq ($$(shell uname -s),Darwin) +ifeq ($$(shell sw_vers | grep -c 10.6),1) EXTRA_RFLAGS_$(1) += --cfg mac_10_6 endif -ifeq ($(shell sw_vers | grep -c 10.7),1) +ifeq ($$(shell sw_vers | grep -c 10.7),1) EXTRA_RFLAGS_$(1) += --cfg mac_10_7 endif else diff --git a/src/components/main/compositing/run.rs b/src/components/main/compositing/run.rs index 6f091c51b64..f833aa5d4ff 100644 --- a/src/components/main/compositing/run.rs +++ b/src/components/main/compositing/run.rs @@ -89,13 +89,13 @@ pub fn run_compositor(compositor: &CompositorTask) { ChangeReadyState(ready_state) => window.set_ready_state(ready_state), ChangeRenderState(render_state) => window.set_render_state(render_state), - SetUnRenderedColor(id, color) => { - match compositor_layer { - Some(ref mut layer) => { - layer.unrendered_color = color; - } - None => {} - } + SetUnRenderedColor(_id, color) => { + match compositor_layer { + Some(ref mut layer) => { + layer.unrendered_color = color; + } + None => {} + } } diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index a20dc523357..46979ca7ce6 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -2170,7 +2170,12 @@ class CGImports(CGWrapper): # TODO imports to cover descriptors, etc. def _useString(imports): - return '#[allow(non_uppercase_statics,unused_imports,unused_variable,unused_unsafe,unused_mut,dead_assignment)];\n' + ''.join(['use %s;\n' % i for i in imports]) + '\n' + # Allow unreachable_code because we use 'break' in a way that sometimes produces + # two 'break's in a row. See for example CallbackMember.getArgConversions. + return '\n'.join([ + '#[allow(unreachable_code,non_uppercase_statics,unused_imports,unused_variable,unused_unsafe,unused_mut,dead_assignment)];', + ''.join('use %s;\n' % i for i in imports), + '']) CGWrapper.__init__(self, child, declarePre=_useString(sorted(declareImports))) diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 4814550e42f..aeb6b317a07 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -28,7 +28,6 @@ use std::comm::SharedChan; use std::hashmap::HashSet; use std::ptr; use std::int; -use std::libc; use std::rt::io::timer::Timer; use std::task::spawn_with; use js::jsapi::JSVal;