Skip to content

Commit 0e31e2f

Browse files
committed
Remove rustc_mir_borrowck attribute and use rustc_mir instead
1 parent eded1aa commit 0e31e2f

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

src/librustc_mir/borrow_check/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fn mir_borrowck<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> BorrowC
8080
let mut return_early;
8181

8282
// Return early if we are not supposed to use MIR borrow checker for this function.
83-
return_early = !tcx.has_attr(def_id, "rustc_mir_borrowck") && !tcx.use_mir_borrowck();
83+
return_early = !tcx.has_attr(def_id, "rustc_mir") && !tcx.use_mir_borrowck();
8484

8585
if tcx.is_struct_constructor(def_id) {
8686
// We are not borrow checking the automatically generated struct constructors

src/librustc_mir/transform/rustc_peek.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl MirPass for SanityCheck {
3636
src: MirSource, mir: &mut Mir<'tcx>) {
3737
let def_id = src.def_id;
3838
let id = tcx.hir.as_local_node_id(def_id).unwrap();
39-
if !tcx.has_attr(def_id, "rustc_mir_borrowck") {
39+
if !tcx.has_attr(def_id, "rustc_mir") {
4040
debug!("skipping rustc_peek::SanityCheck on {}", tcx.item_path_str(def_id));
4141
return;
4242
} else {

src/test/compile-fail/mir-dataflow/def-inits-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
// General test of maybe_uninits state computed by MIR dataflow.
1212

13+
#![feature(nll)]
1314
#![feature(core_intrinsics, rustc_attrs)]
1415

1516
use std::intrinsics::rustc_peek;
1617
use std::mem::{drop, replace};
1718

1819
struct S(i32);
1920

20-
#[rustc_mir_borrowck]
2121
#[rustc_mir(rustc_peek_definite_init,stop_after_dataflow)]
2222
fn foo(test: bool, x: &mut S, y: S, mut z: S) -> S {
2323
let ret;

src/test/compile-fail/mir-dataflow/inits-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
// General test of maybe_inits state computed by MIR dataflow.
1212

13+
#![feature(nll)]
1314
#![feature(core_intrinsics, rustc_attrs)]
1415

1516
use std::intrinsics::rustc_peek;
1617
use std::mem::{drop, replace};
1718

1819
struct S(i32);
1920

20-
#[rustc_mir_borrowck]
2121
#[rustc_mir(rustc_peek_maybe_init,stop_after_dataflow)]
2222
fn foo(test: bool, x: &mut S, y: S, mut z: S) -> S {
2323
let ret;

src/test/compile-fail/mir-dataflow/uninits-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
// General test of maybe_uninits state computed by MIR dataflow.
1212

13+
#![feature(nll)]
1314
#![feature(core_intrinsics, rustc_attrs)]
1415

1516
use std::intrinsics::rustc_peek;
1617
use std::mem::{drop, replace};
1718

1819
struct S(i32);
1920

20-
#[rustc_mir_borrowck]
2121
#[rustc_mir(rustc_peek_maybe_uninit,stop_after_dataflow)]
2222
fn foo(test: bool, x: &mut S, y: S, mut z: S) -> S {
2323
let ret;

src/test/compile-fail/mir-dataflow/uninits-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
// General test of maybe_uninits state computed by MIR dataflow.
1212

13+
#![feature(nll)]
1314
#![feature(core_intrinsics, rustc_attrs)]
1415

1516
use std::intrinsics::rustc_peek;
1617
use std::mem::{drop, replace};
1718

1819
struct S(i32);
1920

20-
#[rustc_mir_borrowck]
2121
#[rustc_mir(rustc_peek_maybe_uninit,stop_after_dataflow)]
2222
fn foo(x: &mut S) {
2323
// `x` is initialized here, so maybe-uninit bit is 0.

0 commit comments

Comments
 (0)