Skip to content

Commit 12b3826

Browse files
committed
Rollup merge of #53992 - pnkfelix:issue-53764-migrate-run-pass-borrowck-to-ui, r=nikomatsakis
migrate run-pass/borrowck to ui/run-pass Part of #53764
2 parents dcca8e8 + ff8f1a3 commit 12b3826

30 files changed

+34
-1
lines changed

src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs renamed to src/test/ui/run-pass/borrowck/borrowck-assign-to-subfield.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// pretty-expanded FIXME #23616
1213

1314
pub fn main() {

src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs renamed to src/test/ui/run-pass/borrowck/borrowck-assignment-to-static-mut.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// Test taken from #45641 (https://github.com/rust-lang/rust/issues/45641)
1213

1314
// revisions: ast mir

src/test/run-pass/borrowck/borrowck-binding-mutbl.rs renamed to src/test/ui/run-pass/borrowck/borrowck-binding-mutbl.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
12+
1113
struct F { f: Vec<isize> }
1214

1315
fn impure(_v: &[isize]) {

src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs renamed to src/test/ui/run-pass/borrowck/borrowck-borrow-from-expr-block.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
#![feature(box_syntax)]
1213

1314
fn borrow<F>(x: &isize, f: F) where F: FnOnce(&isize) {

src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs renamed to src/test/ui/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// Test that freezing an `&mut` pointer while referent is
1213
// frozen is legal.
1314
//

src/test/run-pass/borrowck/borrowck-closures-two-imm.rs renamed to src/test/ui/run-pass/borrowck/borrowck-closures-two-imm.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// Tests that two closures can simultaneously have immutable
1213
// access to the variable, whether that immutable access be used
1314
// for direct reads or for taking immutable ref. Also check

src/test/run-pass/borrowck/borrowck-field-sensitivity.rs renamed to src/test/ui/run-pass/borrowck/borrowck-field-sensitivity.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// pretty-expanded FIXME #23616
1213

1314
#![feature(box_syntax)]

src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs renamed to src/test/ui/run-pass/borrowck/borrowck-fixed-length-vecs.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112

1213
pub fn main() {
1314
let x = [22];

src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs renamed to src/test/ui/run-pass/borrowck/borrowck-freeze-frozen-mut.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// Test that a `&mut` inside of an `&` is freezable.
1213

1314

src/test/run-pass/borrowck/borrowck-lend-args.rs renamed to src/test/ui/run-pass/borrowck/borrowck-lend-args.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112

1213
// pretty-expanded FIXME #23616
1314

src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs renamed to src/test/ui/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
12+
#![allow(unconditional_recursion)]
13+
1114
// Check that we do not ICE when compiling this
1215
// macro, which reuses the expression `$id`
1316

src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs renamed to src/test/ui/run-pass/borrowck/borrowck-move-by-capture-ok.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
#![feature(box_syntax)]
1213

1314
pub fn main() {

src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs renamed to src/test/ui/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// Test case from #39963.
1213

1314
#![feature(nll)]

src/test/run-pass/borrowck/borrowck-mut-uniq.rs renamed to src/test/ui/run-pass/borrowck/borrowck-mut-uniq.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
#![feature(box_syntax)]
1213

1314
use std::mem::swap;

src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs renamed to src/test/ui/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112

1213

1314
fn want_slice(v: &[isize]) -> isize {

src/test/run-pass/borrowck/borrowck-pat-enum.rs renamed to src/test/ui/run-pass/borrowck/borrowck-pat-enum.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// ignore-pretty issue #37199
1213

1314
fn match_ref(v: Option<isize>) -> isize {

src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs renamed to src/test/ui/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112

1213
pub fn main() {
1314
let mut x = None;

src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs renamed to src/test/ui/run-pass/borrowck/borrowck-rvalues-mutable.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112

1213
struct Counter {
1314
value: usize

src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs renamed to src/test/ui/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// Tests that the scope of the pointer returned from `get()` is
1213
// limited to the deref operation itself, and does not infect the
1314
// block as a whole.

src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs renamed to src/test/ui/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
//compile-flags: -Z borrowck=mir
1213

1314
#![feature(slice_patterns)]

src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs renamed to src/test/ui/run-pass/borrowck/borrowck-static-item-in-fn.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// Regression test for issue #7740
1213

1314
// pretty-expanded FIXME #23616

src/test/run-pass/borrowck/borrowck-trait-lifetime.rs renamed to src/test/ui/run-pass/borrowck/borrowck-trait-lifetime.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// This test verifies that casting from the same lifetime on a value
1213
// to the same lifetime on a trait succeeds. See issue #10766.
1314

src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs renamed to src/test/ui/run-pass/borrowck/borrowck-uniq-via-ref.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112

1213
// pretty-expanded FIXME #23616
1314

src/test/run-pass/borrowck/borrowck-univariant-enum.rs renamed to src/test/ui/run-pass/borrowck/borrowck-univariant-enum.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
11+
// run-pass
12+
#![allow(non_camel_case_types)]
1213

1314
use std::cell::Cell;
1415

src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs renamed to src/test/ui/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// revisions: ast mir
1213
//[mir]compile-flags: -Z borrowck=mir
1314

src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs renamed to src/test/ui/run-pass/borrowck/borrowck-unused-mut-locals.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
#![feature(nll)]
1213
#![deny(unused_mut)]
1314

src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs renamed to src/test/ui/run-pass/borrowck/borrowck-use-mut-borrow.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// pretty-expanded FIXME #23616
1213

1314
#![feature(box_syntax)]

src/test/run-pass/borrowck/two-phase-baseline.rs renamed to src/test/ui/run-pass/borrowck/two-phase-baseline.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// compile-flags: -Z borrowck=mir -Z two-phase-borrows
1213

1314
// This is the "goto example" for why we want two phase borrows.

src/test/run-pass/borrowck/two-phase-bin-ops.rs renamed to src/test/ui/run-pass/borrowck/two-phase-bin-ops.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// revisions: lxl nll
1213

1314
#![cfg_attr(nll, feature(nll))]

src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs renamed to src/test/ui/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// run-pass
1112
// revisions: lxl nll
1213
//[lxl]compile-flags: -Z borrowck=mir -Z two-phase-borrows
1314

0 commit comments

Comments
 (0)