Skip to content

Commit e797938

Browse files
committed
Revert "Upgrade to rustc 1.27.0-nightly (8a37c75a3 2018-05-02)"
This reverts commit 46ad811.
1 parent a8bdd44 commit e797938

File tree

6 files changed

+14
-6
lines changed

6 files changed

+14
-6
lines changed

components/allocator/lib.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub use platform::*;
1717
mod platform {
1818
extern crate jemalloc_sys as ffi;
1919

20-
use std::alloc::{GlobalAlloc, Layout, Opaque};
20+
use std::alloc::{GlobalAlloc, Layout, Opaque, System};
2121
use std::os::raw::{c_int, c_void};
2222

2323
/// Get the size of a heap block.
@@ -94,6 +94,11 @@ mod platform {
9494
let flags = layout_to_flags(layout.align(), new_size);
9595
ffi::rallocx(ptr as *mut _, new_size, flags) as *mut Opaque
9696
}
97+
98+
#[inline]
99+
fn oom(&self) -> ! {
100+
System.oom()
101+
}
97102
}
98103
}
99104

components/dom_struct/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
#![feature(proc_macro, proc_macro_non_items)]
5+
#![feature(proc_macro)]
66

77
extern crate proc_macro;
88

components/gfx/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5+
// For SIMD
6+
#![cfg_attr(feature = "unstable", feature(cfg_target_feature))]
7+
58
#![deny(unsafe_code)]
69

710
extern crate app_units;

components/script_plugins/unrooted_must_root.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
143143
let def_id = cx.tcx.hir.local_def_id(id);
144144
let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx);
145145

146-
for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) {
146+
for (arg, ty) in decl.inputs.iter().zip(sig.inputs().0.iter()) {
147147
if is_unrooted_ty(cx, ty, false) {
148148
cx.span_lint(UNROOTED_MUST_ROOT, arg.span, "Type must be rooted")
149149
}
150150
}
151151

152152
if !in_new_function {
153-
if is_unrooted_ty(cx, sig.output().skip_binder(), false) {
153+
if is_unrooted_ty(cx, sig.output().0, false) {
154154
cx.span_lint(UNROOTED_MUST_ROOT, decl.output.span(), "Type must be rooted")
155155
}
156156
}

components/script_plugins/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
2525
other.into_iter()
2626
.map(|e| e.data)
2727
.zip(path)
28-
.all(|(nm, p)| nm.as_interned_str().with(|nm| nm == *p))
28+
.all(|(nm, p)| &*nm.as_interned_str() == *p)
2929
}
3030

3131
pub fn in_derive_expn(span: Span) -> bool {

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2018-05-03
1+
nightly-2018-04-15

0 commit comments

Comments
 (0)