From 1a0e43b0a68697df8a544dbb4bf1d6722b7a8373 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Wed, 15 May 2013 18:14:12 -0700 Subject: [PATCH] servo: Merge #452 - Reorg fixups (from metajack:reorg-fixups) Source-Repo: https://github.com/servo/servo Source-Revision: 1135b0da2ddb8fa8d1e43419f84fde01ea9f19fa --- servo/.gitignore | 12 ++++++------ servo/Makefile.in | 2 -- servo/src/components/servo-net/image_cache_task.rs | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/servo/.gitignore b/servo/.gitignore index 03555c955cfdc..a1ef747f1cede 100644 --- a/servo/.gitignore +++ b/servo/.gitignore @@ -16,9 +16,9 @@ config.mk config.stamp config.tmp parser.out -src/servo/dom/bindings/codegen/*.rs -src/servo/dom/bindings/codegen/_cache/ -src/servo/dom/bindings/codegen/test/*.rs -src/servo/dom/bindings/codegen/PrototypeList.h -src/servo/dom/bindings/codegen/UnionTypes.h -src/servo/dom/bindings/codegen/UnionConversions.h +src/components/servo/dom/bindings/codegen/*.rs +src/components/servo/dom/bindings/codegen/_cache/ +src/components/servo/dom/bindings/codegen/test/*.rs +src/components/servo/dom/bindings/codegen/PrototypeList.h +src/components/servo/dom/bindings/codegen/UnionTypes.h +src/components/servo/dom/bindings/codegen/UnionConversions.h diff --git a/servo/Makefile.in b/servo/Makefile.in index 0864cdb595a33..656e8aaa0affa 100644 --- a/servo/Makefile.in +++ b/servo/Makefile.in @@ -123,8 +123,6 @@ DEPS_SUBMODULES = $(foreach submodule,$(SUBMODULES),\ $(eval $(call DEF_SUBMODULE_VARS,$(submodule)))) -$(info $(DEPS_SUBMODULES)) - # include submodule dependencies configuration include $(S)mk/sub.mk diff --git a/servo/src/components/servo-net/image_cache_task.rs b/servo/src/components/servo-net/image_cache_task.rs index 32cd0b6a0a864..8806b3e7da6a2 100644 --- a/servo/src/components/servo-net/image_cache_task.rs +++ b/servo/src/components/servo-net/image_cache_task.rs @@ -12,7 +12,7 @@ use core::cell::Cell; use core::comm::{Chan, Port, SharedChan, stream}; use core::task::spawn; use core::to_str::ToStr; -use core::util::{replace, swap}; +use core::util::replace; use std::arc::ARC; use std::net::url::Url;