From f12fad7953e67970733f7310224aa332e3165c0e Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sat, 13 Aug 2016 17:17:49 +0200 Subject: [PATCH 1/3] Remove rust_tenacious We don't use it anymore since #11872. --- components/plugins/Cargo.toml | 3 --- components/plugins/lib.rs | 2 -- components/servo/Cargo.lock | 8 -------- ports/cef/Cargo.lock | 8 -------- 4 files changed, 21 deletions(-) diff --git a/components/plugins/Cargo.toml b/components/plugins/Cargo.toml index d60e535bfaf..39ec3723b45 100644 --- a/components/plugins/Cargo.toml +++ b/components/plugins/Cargo.toml @@ -10,9 +10,6 @@ name = "plugins" path = "lib.rs" plugin = true -[dependencies] -tenacious = "0.2.0" - [dependencies.clippy_lints] version = "0.0.77" optional = true diff --git a/components/plugins/lib.rs b/components/plugins/lib.rs index 52bfad7e049..30009d63aeb 100644 --- a/components/plugins/lib.rs +++ b/components/plugins/lib.rs @@ -25,7 +25,6 @@ extern crate rustc_plugin; #[macro_use] extern crate syntax; extern crate syntax_ext; -extern crate tenacious; use rustc_plugin::Registry; use syntax::ext::base::*; @@ -53,7 +52,6 @@ pub fn plugin_registrar(reg: &mut Registry) { reg.register_late_lint_pass(box lints::inheritance_integrity::InheritancePass); reg.register_late_lint_pass(box lints::transmute_type::TransmutePass); reg.register_early_lint_pass(box lints::ban::BanPass); - reg.register_late_lint_pass(box tenacious::TenaciousPass); reg.register_attribute("must_root".to_string(), Whitelisted); reg.register_attribute("servo_lang".to_string(), Whitelisted); reg.register_attribute("allow_unrooted_interior".to_string(), Whitelisted); diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 7351981ff27..90897ef11b2 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1716,9 +1716,6 @@ dependencies = [ [[package]] name = "plugins" version = "0.0.1" -dependencies = [ - "tenacious 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "pnacl-build-helper" @@ -2311,11 +2308,6 @@ dependencies = [ "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "tenacious" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "tendril" version = "0.2.2" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index f324951617b..b10cfbc75b0 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1580,9 +1580,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "plugins" version = "0.0.1" -dependencies = [ - "tenacious 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "pnacl-build-helper" @@ -2179,11 +2176,6 @@ dependencies = [ "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "tenacious" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "tendril" version = "0.2.2" From 9f5122f48724ae125e687bed246b5fe4ebc38e03 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sat, 13 Aug 2016 14:55:26 +0200 Subject: [PATCH 2/3] Update image to 0.10.2 to silence some warnings --- components/servo/Cargo.lock | 13 +++++++------ ports/cef/Cargo.lock | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 90897ef11b2..f35d78400b2 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -314,7 +314,7 @@ dependencies = [ "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1009,7 +1009,7 @@ dependencies = [ [[package]] name = "image" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1021,6 +1021,7 @@ dependencies = [ "num-rational 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1470,7 +1471,7 @@ dependencies = [ "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1908,7 +1909,7 @@ dependencies = [ "html5ever 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.3 (git+https://github.com/servo/rust-mozjs)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2126,7 +2127,7 @@ dependencies = [ "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2575,7 +2576,7 @@ dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index b10cfbc75b0..bb56b8534cf 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -273,7 +273,7 @@ dependencies = [ "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "gleam 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "layers 0.4.0 (git+https://github.com/servo/rust-layers)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -918,7 +918,7 @@ dependencies = [ [[package]] name = "image" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -930,6 +930,7 @@ dependencies = [ "num-rational 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1350,7 +1351,7 @@ dependencies = [ "heapsize_plugin 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1761,7 +1762,7 @@ dependencies = [ "html5ever 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "js 0.1.3 (git+https://github.com/servo/rust-mozjs)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2010,7 +2011,7 @@ dependencies = [ "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2436,7 +2437,7 @@ dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", - "image 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "image 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", From fc6faf72ee6a50b878511066d70b18fa80a84d42 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sat, 13 Aug 2016 14:55:01 +0200 Subject: [PATCH 3/3] Update Rust to 1.12.0-nightly (1deb02ea6 2016-08-12) --- components/layout/fragment.rs | 2 +- components/net/fetch/cors_cache.rs | 3 +-- components/script/dom/request.rs | 4 ++-- components/servo/Cargo.lock | 5 +++-- components/util/opts.rs | 2 +- rust-nightly-date | 2 +- tests/compiletest/helper/Cargo.toml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 254ed8d4177..bfef94fdd0d 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -23,7 +23,7 @@ use inline::{InlineMetrics, LAST_FRAGMENT_OF_ELEMENT}; use ipc_channel::ipc::IpcSender; #[cfg(debug_assertions)] use layout_debug; -use model::{self, Direction, IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto, specified}; +use model::{self, Direction, IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto}; use msg::constellation_msg::PipelineId; use net_traits::image::base::{Image, ImageMetadata}; use net_traits::image_cache_thread::{ImageOrMetadataAvailable, UsePlaceholder}; diff --git a/components/net/fetch/cors_cache.rs b/components/net/fetch/cors_cache.rs index 97861283606..8d494ab33c1 100644 --- a/components/net/fetch/cors_cache.rs +++ b/components/net/fetch/cors_cache.rs @@ -12,8 +12,7 @@ use hyper::method::Method; use net_traits::request::{CredentialsMode, Origin, Request}; use std::ascii::AsciiExt; -use time; -use time::{now, Timespec}; +use time::{self, Timespec}; use url::Url; /// Union type for CORS cache entries diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index a764aec6265..7f612157566 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -507,13 +507,13 @@ fn includes_credentials(input: &Url) -> bool { // TODO: `Readable Stream` object is not implemented in Servo yet. // https://fetch.spec.whatwg.org/#concept-body-disturbed -fn request_is_disturbed(input: &Request) -> bool { +fn request_is_disturbed(_input: &Request) -> bool { false } // TODO: `Readable Stream` object is not implemented in Servo yet. // https://fetch.spec.whatwg.org/#concept-body-locked -fn request_is_locked(input: &Request) -> bool { +fn request_is_locked(_input: &Request) -> bool { false } diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index f35d78400b2..6cc998d5fd3 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -294,15 +294,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "compiletest_helper" version = "0.0.1" dependencies = [ - "compiletest_rs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "compiletest_rs 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "compiletest_rs" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/components/util/opts.rs b/components/util/opts.rs index 8894533c73b..2e957e8371c 100644 --- a/components/util/opts.rs +++ b/components/util/opts.rs @@ -15,7 +15,7 @@ use std::cmp; use std::default::Default; use std::env; use std::fs::{self, File}; -use std::io::{self, Read, Write, stderr}; +use std::io::{self, Read, Write}; use std::path::{Path, PathBuf}; use std::process; use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering}; diff --git a/rust-nightly-date b/rust-nightly-date index 9fd465ab723..00f860602c0 100644 --- a/rust-nightly-date +++ b/rust-nightly-date @@ -1 +1 @@ -2016-08-05 +2016-08-13 diff --git a/tests/compiletest/helper/Cargo.toml b/tests/compiletest/helper/Cargo.toml index d44e109fec1..01c5816668d 100644 --- a/tests/compiletest/helper/Cargo.toml +++ b/tests/compiletest/helper/Cargo.toml @@ -10,4 +10,4 @@ path = "lib.rs" doctest = false [dependencies] -compiletest_rs = "0.1.3" +compiletest_rs = "0.2.0"