Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from May 30, 2018
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

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

Fixes #20844
  • Loading branch information
nox authored and SimonSapin committed May 30, 2018
commit a553964123d9e65fc483e608864d880ba1909300
@@ -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()
}
}
}

@@ -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;

@@ -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;
@@ -9,7 +9,7 @@ publish = false
path = "lib.rs"

[features]
unstable = ["serde/unstable"]
unstable = []

[dependencies]
serde = "1.0.14"
@@ -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;
@@ -16,6 +16,7 @@


#![deny(unsafe_code)]
#![feature(macro_at_most_once_rep)]
#![feature(macro_vis_matcher)]
#![feature(plugin)]
#![feature(plugin_registrar)]
@@ -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")
}
}
@@ -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 {
@@ -21,7 +21,6 @@ webrender_debugger = ["webrender/debugger"]
oculusvr = ["webvr/oculusvr"]
unstable = [
"euclid/unstable",
"gfx/unstable",
"msg/unstable",
"profile/unstable",
"script/unstable",
@@ -1 +1 @@
nightly-2018-04-15
nightly-2018-05-30
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.