auto merge of #5380 : fabricedesre/servo/no-unused-import, r=Ms2ger

This commit is contained in:
bors-servo 2015-03-26 08:51:51 -06:00
commit 26c77d6662
2 changed files with 2 additions and 2 deletions

View file

@ -44,7 +44,7 @@ use net::image_cache_task::{ImageCacheTask, ImageResponseMsg};
use net::local_image_cache::{ImageResponder, LocalImageCache}; use net::local_image_cache::{ImageResponder, LocalImageCache};
use net::resource_task::{ResourceTask, load_bytes_iter}; use net::resource_task::{ResourceTask, load_bytes_iter};
use profile::mem::{self, Report, ReportsChan}; use profile::mem::{self, Report, ReportsChan};
use profile::time::{self, ProfilerCategory, ProfilerMetadata, profile}; use profile::time::{self, ProfilerMetadata, profile};
use profile::time::{TimerMetadataFrameType, TimerMetadataReflowType}; use profile::time::{TimerMetadataFrameType, TimerMetadataReflowType};
use script::dom::bindings::js::LayoutJS; use script::dom::bindings::js::LayoutJS;
use script::dom::element::ElementTypeId; use script::dom::element::ElementTypeId;

View file

@ -20,7 +20,7 @@ use wrapper::{layout_node_to_unsafe_layout_node, layout_node_from_unsafe_layout_
use wrapper::{PostorderNodeMutTraversal, UnsafeLayoutNode}; use wrapper::{PostorderNodeMutTraversal, UnsafeLayoutNode};
use wrapper::{PreorderDomTraversal, PostorderDomTraversal}; use wrapper::{PreorderDomTraversal, PostorderDomTraversal};
use profile::time::{self, ProfilerCategory, ProfilerMetadata, profile}; use profile::time::{self, ProfilerMetadata, profile};
use std::mem; use std::mem;
use std::ptr; use std::ptr;
use std::sync::atomic::{AtomicIsize, Ordering}; use std::sync::atomic::{AtomicIsize, Ordering};