diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/dom_struct/lib.rs | 5 | ||||
| -rw-r--r-- | components/script/dom/bindings/str.rs | 2 | ||||
| -rw-r--r-- | components/script/lib.rs | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/components/dom_struct/lib.rs b/components/dom_struct/lib.rs index 41cf4a67527..86c7134a78f 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 4520fd15a6c..c4cc5f51d21 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 02a86ee4d5d..dd2bd23d1ca 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)] |