From 0e31e2fa9b984ac15e3818685fa3ad87216811df Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 4 Jul 2018 19:25:37 -0300 Subject: [PATCH] Remove rustc_mir_borrowck attribute and use rustc_mir instead --- src/librustc_mir/borrow_check/mod.rs | 2 +- src/librustc_mir/transform/rustc_peek.rs | 2 +- src/test/compile-fail/mir-dataflow/def-inits-1.rs | 2 +- src/test/compile-fail/mir-dataflow/inits-1.rs | 2 +- src/test/compile-fail/mir-dataflow/uninits-1.rs | 2 +- src/test/compile-fail/mir-dataflow/uninits-2.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/librustc_mir/borrow_check/mod.rs b/src/librustc_mir/borrow_check/mod.rs index 3aaa3378bb005..ba649f8e7a909 100644 --- a/src/librustc_mir/borrow_check/mod.rs +++ b/src/librustc_mir/borrow_check/mod.rs @@ -80,7 +80,7 @@ fn mir_borrowck<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> BorrowC let mut return_early; // Return early if we are not supposed to use MIR borrow checker for this function. - return_early = !tcx.has_attr(def_id, "rustc_mir_borrowck") && !tcx.use_mir_borrowck(); + return_early = !tcx.has_attr(def_id, "rustc_mir") && !tcx.use_mir_borrowck(); if tcx.is_struct_constructor(def_id) { // We are not borrow checking the automatically generated struct constructors diff --git a/src/librustc_mir/transform/rustc_peek.rs b/src/librustc_mir/transform/rustc_peek.rs index b23f056801210..da149f420644c 100644 --- a/src/librustc_mir/transform/rustc_peek.rs +++ b/src/librustc_mir/transform/rustc_peek.rs @@ -36,7 +36,7 @@ impl MirPass for SanityCheck { src: MirSource, mir: &mut Mir<'tcx>) { let def_id = src.def_id; let id = tcx.hir.as_local_node_id(def_id).unwrap(); - if !tcx.has_attr(def_id, "rustc_mir_borrowck") { + if !tcx.has_attr(def_id, "rustc_mir") { debug!("skipping rustc_peek::SanityCheck on {}", tcx.item_path_str(def_id)); return; } else { diff --git a/src/test/compile-fail/mir-dataflow/def-inits-1.rs b/src/test/compile-fail/mir-dataflow/def-inits-1.rs index f3c9f29821ebb..f5f0ede6864f4 100644 --- a/src/test/compile-fail/mir-dataflow/def-inits-1.rs +++ b/src/test/compile-fail/mir-dataflow/def-inits-1.rs @@ -10,6 +10,7 @@ // General test of maybe_uninits state computed by MIR dataflow. +#![feature(nll)] #![feature(core_intrinsics, rustc_attrs)] use std::intrinsics::rustc_peek; @@ -17,7 +18,6 @@ use std::mem::{drop, replace}; struct S(i32); -#[rustc_mir_borrowck] #[rustc_mir(rustc_peek_definite_init,stop_after_dataflow)] fn foo(test: bool, x: &mut S, y: S, mut z: S) -> S { let ret; diff --git a/src/test/compile-fail/mir-dataflow/inits-1.rs b/src/test/compile-fail/mir-dataflow/inits-1.rs index 8a5ab6e420ade..595f01f7c94b3 100644 --- a/src/test/compile-fail/mir-dataflow/inits-1.rs +++ b/src/test/compile-fail/mir-dataflow/inits-1.rs @@ -10,6 +10,7 @@ // General test of maybe_inits state computed by MIR dataflow. +#![feature(nll)] #![feature(core_intrinsics, rustc_attrs)] use std::intrinsics::rustc_peek; @@ -17,7 +18,6 @@ use std::mem::{drop, replace}; struct S(i32); -#[rustc_mir_borrowck] #[rustc_mir(rustc_peek_maybe_init,stop_after_dataflow)] fn foo(test: bool, x: &mut S, y: S, mut z: S) -> S { let ret; diff --git a/src/test/compile-fail/mir-dataflow/uninits-1.rs b/src/test/compile-fail/mir-dataflow/uninits-1.rs index 8df66ea815c68..bb10c03254e3c 100644 --- a/src/test/compile-fail/mir-dataflow/uninits-1.rs +++ b/src/test/compile-fail/mir-dataflow/uninits-1.rs @@ -10,6 +10,7 @@ // General test of maybe_uninits state computed by MIR dataflow. +#![feature(nll)] #![feature(core_intrinsics, rustc_attrs)] use std::intrinsics::rustc_peek; @@ -17,7 +18,6 @@ use std::mem::{drop, replace}; struct S(i32); -#[rustc_mir_borrowck] #[rustc_mir(rustc_peek_maybe_uninit,stop_after_dataflow)] fn foo(test: bool, x: &mut S, y: S, mut z: S) -> S { let ret; diff --git a/src/test/compile-fail/mir-dataflow/uninits-2.rs b/src/test/compile-fail/mir-dataflow/uninits-2.rs index 2edd275e78691..9854ea779b3ad 100644 --- a/src/test/compile-fail/mir-dataflow/uninits-2.rs +++ b/src/test/compile-fail/mir-dataflow/uninits-2.rs @@ -10,6 +10,7 @@ // General test of maybe_uninits state computed by MIR dataflow. +#![feature(nll)] #![feature(core_intrinsics, rustc_attrs)] use std::intrinsics::rustc_peek; @@ -17,7 +18,6 @@ use std::mem::{drop, replace}; struct S(i32); -#[rustc_mir_borrowck] #[rustc_mir(rustc_peek_maybe_uninit,stop_after_dataflow)] fn foo(x: &mut S) { // `x` is initialized here, so maybe-uninit bit is 0.