From 3d6614e3145f0955be55bf5656aa805fedef639c Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 29 Mar 2018 16:25:53 +0200 Subject: [PATCH] Upgrade to rustc 1.27.0-nightly (056f589fb 2018-04-07) --- Cargo.lock | 12 ++++++------ components/dom_struct/lib.rs | 5 ++--- components/script/dom/bindings/str.rs | 2 +- components/script/lib.rs | 3 --- rust-toolchain | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d43a61a925e..4174c3634721 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -205,7 +205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "blurmac" version = "0.1.0" -source = "git+https://github.com/servo/devices#1069d67cbacb28b77a3d5dd7f211171c05f32c62" +source = "git+https://github.com/servo/devices#eeb6eaddb79c019bb5c85558b3410b836da57a57" dependencies = [ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -688,7 +688,7 @@ dependencies = [ [[package]] name = "device" version = "0.0.1" -source = "git+https://github.com/servo/devices#1069d67cbacb28b77a3d5dd7f211171c05f32c62" +source = "git+https://github.com/servo/devices#eeb6eaddb79c019bb5c85558b3410b836da57a57" dependencies = [ "blurdroid 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "blurmac 0.1.0 (git+https://github.com/servo/devices)", @@ -1110,7 +1110,7 @@ dependencies = [ "shared_library 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.12.5 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winit 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "x11-dl 2.17.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2737,7 +2737,7 @@ dependencies = [ "tinyfiledialogs 3.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winit 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "winres 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.17.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3664,7 +3664,7 @@ dependencies = [ [[package]] name = "winit" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4082,7 +4082,7 @@ dependencies = [ "checksum winapi-i686-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ec6667f60c23eca65c561e63a13d81b44234c2e38a6b6c959025ee907ec614cc" "checksum winapi-x86_64-pc-windows-gnu 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "98f12c52b2630cd05d2c3ffd8e008f7f48252c042b4871c72aed9dc733b96668" "checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" -"checksum winit 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "396f0350e661940359e3c8c7d58ff847f67997943e2c80ecac374c5aa8287f63" +"checksum winit 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a29847ed6928d6cbabe6b2d5b11dd0ce63380af53a8dcd41775d27d104d285" "checksum winres 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "27d9192d6356d7efe8405dec6c5506b67543cf64b6049968f39f4c4623b4f25d" "checksum ws 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "89c48c53bf9dee34411a08993c10b879c36e105d609b46e25673befe3a5c1320" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" diff --git a/components/dom_struct/lib.rs b/components/dom_struct/lib.rs index 41cf4a675274..86c7134a78fe 100644 --- a/components/dom_struct/lib.rs +++ b/components/dom_struct/lib.rs @@ -7,7 +7,6 @@ extern crate proc_macro; use proc_macro::{TokenStream, quote}; -use std::iter; #[proc_macro_attribute] pub fn dom_struct(args: TokenStream, input: TokenStream) -> TokenStream { @@ -21,7 +20,7 @@ pub fn dom_struct(args: TokenStream, input: TokenStream) -> TokenStream { }; // Work around https://github.com/rust-lang/rust/issues/46489 - let attributes = attributes.to_string().parse().unwrap(); + let attributes: TokenStream = attributes.to_string().parse().unwrap(); - iter::once(attributes).chain(iter::once(input)).collect() + attributes.into_iter().chain(input.into_iter()).collect() } diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs index 4520fd15a6c8..c4cc5f51d213 100644 --- a/components/script/dom/bindings/str.rs +++ b/components/script/dom/bindings/str.rs @@ -208,7 +208,7 @@ impl DOMString { let first_non_whitespace = self.0.find(|ref c| !char::is_ascii_whitespace(c)).unwrap(); self.0.truncate(last_non_whitespace); - let _ = self.0.splice(0..first_non_whitespace, ""); + let _ = self.0.replace_range(0..first_non_whitespace, ""); } /// Validates this `DOMString` is a time string according to diff --git a/components/script/lib.rs b/components/script/lib.rs index 02a86ee4d5d9..dd2bd23d1cad 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -4,13 +4,10 @@ #![cfg_attr(feature = "unstable", feature(core_intrinsics))] #![cfg_attr(feature = "unstable", feature(on_unimplemented))] -#![feature(ascii_ctype)] -#![feature(conservative_impl_trait)] #![feature(const_fn)] #![feature(mpsc_select)] #![feature(plugin)] #![feature(proc_macro)] -#![feature(splice)] #![feature(string_retain)] #![deny(unsafe_code)] diff --git a/rust-toolchain b/rust-toolchain index b37ad66c2be5..7b4c87520cbb 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2018-01-27 +nightly-2018-04-08