From 53f502368592b53c1593271fc56be47459861d5a Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 20 Dec 2016 06:34:01 +0100 Subject: [PATCH] Fix/silence some warnings --- components/net/image_cache_thread.rs | 2 +- components/script/dom/bindings/codegen/CodegenRust.py | 4 +++- components/script/dom/htmlmediaelement.rs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/net/image_cache_thread.rs b/components/net/image_cache_thread.rs index 7ef657e345f..2df54b8e30c 100644 --- a/components/net/image_cache_thread.rs +++ b/components/net/image_cache_thread.rs @@ -5,7 +5,7 @@ use immeta::load_from_buf; use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use ipc_channel::router::ROUTER; -use net_traits::{CoreResourceThread, NetworkError, fetch_async, FetchResponseMsg, FetchMetadata, Metadata}; +use net_traits::{CoreResourceThread, NetworkError, fetch_async, FetchResponseMsg}; use net_traits::image::base::{Image, ImageMetadata, PixelFormat, load_from_memory}; use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheCommand, ImageCacheThread, ImageState}; use net_traits::image_cache_thread::{ImageCacheResult, ImageOrMetadataAvailable, ImageResponse, UsePlaceholder}; diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 6329a81048f..d68b1adf33e 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4260,7 +4260,9 @@ class CGUnionConversionStruct(CGThing): return CGWrapper( CGIndenter(jsConversion, 4), - pre="unsafe fn TryConvertTo%s(cx: *mut JSContext, value: HandleValue) -> %s {\n" % (t.name, returnType), + # TryConvertToObject is unused, but not generating it while generating others is tricky. + pre="#[allow(dead_code)] unsafe fn TryConvertTo%s(cx: *mut JSContext, value: HandleValue) -> %s {\n" + % (t.name, returnType), post="\n}") def define(self): diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 8a3f35c23d4..ad899de4c9d 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -437,6 +437,7 @@ impl HTMLMediaElement { } // https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm + #[allow(unreachable_code)] fn resource_selection_algorithm_sync(&self, base_url: ServoUrl) { // TODO step 5 (populate pending text tracks) @@ -446,7 +447,7 @@ impl HTMLMediaElement { ResourceSelectionMode::Object } else if let Some(attr) = self.upcast::().get_attribute(&ns!(), &local_name!("src")) { ResourceSelectionMode::Attribute(attr.Value().to_string()) - } else if false { + } else if false { // TODO: when implementing this remove #[allow(unreachable_code)] above. // TODO child ResourceSelectionMode::Children(panic!()) } else {