Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #1306 : kmcallister/servo/cleanup, r=jdm

Browse source
This commit is contained in:
bors-servo 2013-11-25 14:37:06 -08:00
commit 0d15310db1
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mk/rustpkg.mk
View file

@ -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

14
src/components/main/compositing/run.rs
View file

@ -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 => {}
}
}

7
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -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)))

1
src/components/script/dom/window.rs
View file

@ -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;