Skip to content

Commit

Permalink
Upgrade to rustc 1.27.0-nightly (8a37c75a3 2018-05-02)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed May 4, 2018
1 parent 6059d0c commit 46ad811
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 14 deletions.
7 changes: 1 addition & 6 deletions components/allocator/lib.rs
Expand Up @@ -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.
Expand Down Expand Up @@ -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()
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion components/dom_struct/lib.rs
Expand Up @@ -2,7 +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/. */

#![feature(proc_macro)]
#![feature(proc_macro, proc_macro_non_items)]

extern crate proc_macro;

Expand Down
3 changes: 0 additions & 3 deletions components/gfx/lib.rs
Expand Up @@ -2,9 +2,6 @@
* 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))]

#![deny(unsafe_code)]

extern crate app_units;
Expand Down
4 changes: 2 additions & 2 deletions components/script_plugins/unrooted_must_root.rs
Expand Up @@ -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")
}
}
Expand Down
2 changes: 1 addition & 1 deletion components/script_plugins/utils.rs
Expand Up @@ -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().with(|nm| nm == *p))
}

pub fn in_derive_expn(span: Span) -> bool {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
@@ -1 +1 @@
nightly-2018-04-15
nightly-2018-05-03

0 comments on commit 46ad811

Please sign in to comment.