Skip to content

Commit fff9dde

Browse files
committed
For feature-gate-nll test, turn off testing modes that externally enable NLL.
1 parent b75fbbf commit fff9dde

File tree

2 files changed

+11
-24
lines changed

2 files changed

+11
-24
lines changed

Diff for: src/test/ui/feature-gates/feature-gate-nll.nll.stderr

-13
This file was deleted.

Diff for: src/test/ui/feature-gates/feature-gate-nll.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
10-
#![feature(rustc_attrs)]
1+
// This is a test checking that if you do not opt into NLL then you
2+
// should not get the effects of NLL applied to the test.
3+
4+
// Don't use 2018 edition, since that turns on NLL (migration mode).
5+
// edition:2015
6+
7+
// Don't use compare-mode=nll, since that turns on NLL.
8+
// ignore-compare-mode-nll
9+
10+
1111
#![allow(dead_code)]
1212

13-
fn main() { #![rustc_error] // rust-lang/rust#49855
13+
fn main() {
1414
let mut x = 33;
1515

1616
let p = &x;

0 commit comments

Comments
 (0)