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

Revert "Upgrade to rustc 1.27.0-nightly (8a37c75a3 2018-05-02)" #20820

Merged
merged 1 commit into from May 18, 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

Revert "Upgrade to rustc 1.27.0-nightly (8a37c75a3 2018-05-02)"

This reverts commit 46ad811.
  • Loading branch information
jdm committed May 18, 2018
commit e7979380bafbb484ea63f7ad5f338b266a6bc0a5
@@ -17,7 +17,7 @@ pub use platform::*;
mod platform {
extern crate jemalloc_sys as ffi;

use std::alloc::{GlobalAlloc, Layout, Opaque};
use std::alloc::{GlobalAlloc, Layout, Opaque, System};
use std::os::raw::{c_int, c_void};

/// Get the size of a heap block.
@@ -94,6 +94,11 @@ 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()
}
}
}

@@ -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, proc_macro_non_items)]
#![feature(proc_macro)]

extern crate proc_macro;

@@ -2,6 +2,9 @@
* 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;
@@ -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().skip_binder().iter()) {
for (arg, ty) in decl.inputs.iter().zip(sig.inputs().0.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().skip_binder(), false) {
if is_unrooted_ty(cx, sig.output().0, 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().with(|nm| nm == *p))
.all(|(nm, p)| &*nm.as_interned_str() == *p)
}

pub fn in_derive_expn(span: Span) -> bool {
@@ -1 +1 @@
nightly-2018-05-03
nightly-2018-04-15
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.