Upgrade to rustc 1.28.0-nightly (524ad9b9e 2018-05-29)

Fixes https://github.com/servo/servo/issues/20844
This commit is contained in:
Anthony Ramine 2018-05-24 11:28:20 +02:00 committed by Simon Sapin
parent 11a89bcc47
commit a553964123
10 changed files with 9 additions and 16 deletions

View file

@ -17,7 +17,7 @@ pub use platform::*;
mod platform { mod platform {
extern crate jemalloc_sys as ffi; 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}; use std::os::raw::{c_int, c_void};
/// Get the size of a heap block. /// Get the size of a heap block.
@ -94,11 +94,6 @@ mod platform {
let flags = layout_to_flags(layout.align(), new_size); let flags = layout_to_flags(layout.align(), new_size);
ffi::rallocx(ptr as *mut _, new_size, flags) as *mut Opaque ffi::rallocx(ptr as *mut _, new_size, flags) as *mut Opaque
} }
#[inline]
fn oom(&self) -> ! {
System.oom()
}
} }
} }

View file

@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(proc_macro)] #![feature(proc_macro)]
#![feature(proc_macro_non_items)]
extern crate proc_macro; extern crate proc_macro;

View file

@ -2,9 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// For SIMD #![cfg_attr(feature = "unstable", feature(stdsimd))]
#![cfg_attr(feature = "unstable", feature(cfg_target_feature, stdsimd))]
#![deny(unsafe_code)] #![deny(unsafe_code)]
extern crate app_units; extern crate app_units;

View file

@ -9,7 +9,7 @@ publish = false
path = "lib.rs" path = "lib.rs"
[features] [features]
unstable = ["serde/unstable"] unstable = []
[dependencies] [dependencies]
serde = "1.0.14" serde = "1.0.14"

View file

@ -5,7 +5,6 @@
//! `NonZero*` types that are either `core::nonzero::NonZero<_>` //! `NonZero*` types that are either `core::nonzero::NonZero<_>`
//! or some stable types with an equivalent API (but no memory layout optimization). //! 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))] #![cfg_attr(feature = "unstable", feature(const_fn))]
extern crate serde; extern crate serde;

View file

@ -16,6 +16,7 @@
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![feature(macro_at_most_once_rep)]
#![feature(macro_vis_matcher)] #![feature(macro_vis_matcher)]
#![feature(plugin)] #![feature(plugin)]
#![feature(plugin_registrar)] #![feature(plugin_registrar)]

View file

@ -143,14 +143,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
let def_id = cx.tcx.hir.local_def_id(id); let def_id = cx.tcx.hir.local_def_id(id);
let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx); 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) { if is_unrooted_ty(cx, ty, false) {
cx.span_lint(UNROOTED_MUST_ROOT, arg.span, "Type must be rooted") cx.span_lint(UNROOTED_MUST_ROOT, arg.span, "Type must be rooted")
} }
} }
if !in_new_function { 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") cx.span_lint(UNROOTED_MUST_ROOT, decl.output.span(), "Type must be rooted")
} }
} }

View file

@ -25,7 +25,7 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
other.into_iter() other.into_iter()
.map(|e| e.data) .map(|e| e.data)
.zip(path) .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 { pub fn in_derive_expn(span: Span) -> bool {

View file

@ -21,7 +21,6 @@ webrender_debugger = ["webrender/debugger"]
oculusvr = ["webvr/oculusvr"] oculusvr = ["webvr/oculusvr"]
unstable = [ unstable = [
"euclid/unstable", "euclid/unstable",
"gfx/unstable",
"msg/unstable", "msg/unstable",
"profile/unstable", "profile/unstable",
"script/unstable", "script/unstable",

View file

@ -1 +1 @@
nightly-2018-04-15 nightly-2018-05-30