diff options
| -rw-r--r-- | components/allocator/lib.rs | 7 | ||||
| -rw-r--r-- | components/dom_struct/lib.rs | 1 | ||||
| -rw-r--r-- | components/gfx/lib.rs | 4 | ||||
| -rw-r--r-- | components/nonzero/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/nonzero/lib.rs | 1 | ||||
| -rw-r--r-- | components/script_plugins/lib.rs | 1 | ||||
| -rw-r--r-- | components/script_plugins/unrooted_must_root.rs | 4 | ||||
| -rw-r--r-- | components/script_plugins/utils.rs | 2 | ||||
| -rw-r--r-- | components/servo/Cargo.toml | 1 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
10 files changed, 9 insertions, 16 deletions
diff --git a/components/allocator/lib.rs b/components/allocator/lib.rs index 3d933599688..c2f2d9796a4 100644 --- a/components/allocator/lib.rs +++ b/components/allocator/lib.rs @@ -17,7 +17,7 @@ pub use platform::*; mod platform { extern crate jemalloc_sys as ffi; - use std::alloc::{GlobalAlloc, Layout, Opaque, System}; + use std::alloc::{GlobalAlloc, Layout, Opaque}; use std::os::raw::{c_int, c_void}; /// Get the size of a heap block. @@ -94,11 +94,6 @@ mod platform { let flags = layout_to_flags(layout.align(), new_size); ffi::rallocx(ptr as *mut _, new_size, flags) as *mut Opaque } - - #[inline] - fn oom(&self) -> ! { - System.oom() - } } } diff --git a/components/dom_struct/lib.rs b/components/dom_struct/lib.rs index 86c7134a78f..8eacafddeaf 100644 --- a/components/dom_struct/lib.rs +++ b/components/dom_struct/lib.rs @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #![feature(proc_macro)] +#![feature(proc_macro_non_items)] extern crate proc_macro; diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs index f0acfdfa084..5a697f47c0d 100644 --- a/components/gfx/lib.rs +++ b/components/gfx/lib.rs @@ -2,9 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -// For SIMD -#![cfg_attr(feature = "unstable", feature(cfg_target_feature, stdsimd))] - +#![cfg_attr(feature = "unstable", feature(stdsimd))] #![deny(unsafe_code)] extern crate app_units; diff --git a/components/nonzero/Cargo.toml b/components/nonzero/Cargo.toml index 15ba28f7eae..cddf62e3a14 100644 --- a/components/nonzero/Cargo.toml +++ b/components/nonzero/Cargo.toml @@ -9,7 +9,7 @@ publish = false path = "lib.rs" [features] -unstable = ["serde/unstable"] +unstable = [] [dependencies] serde = "1.0.14" diff --git a/components/nonzero/lib.rs b/components/nonzero/lib.rs index 7d3d3644506..3f8a45cf359 100644 --- a/components/nonzero/lib.rs +++ b/components/nonzero/lib.rs @@ -5,7 +5,6 @@ //! `NonZero*` types that are either `core::nonzero::NonZero<_>` //! or some stable types with an equivalent API (but no memory layout optimization). -#![cfg_attr(feature = "unstable", feature(nonzero))] #![cfg_attr(feature = "unstable", feature(const_fn))] extern crate serde; diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs index 3f256fdf11c..eb21b57be16 100644 --- a/components/script_plugins/lib.rs +++ b/components/script_plugins/lib.rs @@ -16,6 +16,7 @@ #![deny(unsafe_code)] +#![feature(macro_at_most_once_rep)] #![feature(macro_vis_matcher)] #![feature(plugin)] #![feature(plugin_registrar)] diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs index 502ae03de12..6277b309c0c 100644 --- a/components/script_plugins/unrooted_must_root.rs +++ b/components/script_plugins/unrooted_must_root.rs @@ -143,14 +143,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { let def_id = cx.tcx.hir.local_def_id(id); let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx); - for (arg, ty) in decl.inputs.iter().zip(sig.inputs().0.iter()) { + for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) { if is_unrooted_ty(cx, ty, false) { cx.span_lint(UNROOTED_MUST_ROOT, arg.span, "Type must be rooted") } } if !in_new_function { - if is_unrooted_ty(cx, sig.output().0, false) { + if is_unrooted_ty(cx, sig.output().skip_binder(), false) { cx.span_lint(UNROOTED_MUST_ROOT, decl.output.span(), "Type must be rooted") } } diff --git a/components/script_plugins/utils.rs b/components/script_plugins/utils.rs index 45a348ea14f..9199e5b083b 100644 --- a/components/script_plugins/utils.rs +++ b/components/script_plugins/utils.rs @@ -25,7 +25,7 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool { other.into_iter() .map(|e| e.data) .zip(path) - .all(|(nm, p)| &*nm.as_interned_str() == *p) + .all(|(nm, p)| &*nm.as_interned_str().as_str() == *p) } pub fn in_derive_expn(span: Span) -> bool { diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index d4379f8a8e5..0acd9940ebe 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -21,7 +21,6 @@ webrender_debugger = ["webrender/debugger"] oculusvr = ["webvr/oculusvr"] unstable = [ "euclid/unstable", - "gfx/unstable", "msg/unstable", "profile/unstable", "script/unstable", diff --git a/rust-toolchain b/rust-toolchain index 84ce4f35a64..88343d93f31 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2018-04-15 +nightly-2018-05-30 |