Skip to content

Commit

Permalink
Removed an unneeded instance of // revisions; the compare-mode NLL …
Browse files Browse the repository at this point in the history
…shows the output is identical now.
  • Loading branch information
pnkfelix committed Nov 8, 2018
1 parent 653da4f commit 918f70f
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 202 deletions.
150 changes: 0 additions & 150 deletions src/test/ui/lint/lint-unused-mut-variables.nll.stderr

This file was deleted.

72 changes: 36 additions & 36 deletions src/test/ui/lint/lint-unused-mut-variables.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// revisions: lexical nll
#![cfg_attr(nll, feature(nll))]



// Exercise the unused_mut attribute in some positive and negative cases

Expand All @@ -21,68 +21,68 @@

fn main() {
// negative cases
let mut a = 3; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let mut a = 2; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let mut b = 3; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let mut a = vec![3]; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let (mut a, b) = (1, 2); //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let mut a; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let mut a = 3; //~ ERROR: variable does not need to be mutable

let mut a = 2; //~ ERROR: variable does not need to be mutable

let mut b = 3; //~ ERROR: variable does not need to be mutable

let mut a = vec![3]; //~ ERROR: variable does not need to be mutable

let (mut a, b) = (1, 2); //~ ERROR: variable does not need to be mutable

let mut a; //~ ERROR: variable does not need to be mutable

a = 3;

let mut b; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let mut b; //~ ERROR: variable does not need to be mutable

if true {
b = 3;
} else {
b = 4;
}

match 30 {
mut x => {} //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
mut x => {} //~ ERROR: variable does not need to be mutable

}
match (30, 2) {
(mut x, 1) | //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
(mut x, 1) | //~ ERROR: variable does not need to be mutable

(mut x, 2) |
(mut x, 3) => {
}
_ => {}
}

let x = |mut y: isize| 10; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
fn what(mut foo: isize) {} //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let x = |mut y: isize| 10; //~ ERROR: variable does not need to be mutable

fn what(mut foo: isize) {} //~ ERROR: variable does not need to be mutable


let mut a = &mut 5; //~ ERROR: variable does not need to be mutable

let mut a = &mut 5; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
*a = 4;

let mut a = 5;
let mut b = (&mut a,); //[lexical]~ ERROR: variable does not need to be mutable
*b.0 = 4; //[nll]~^ ERROR: variable does not need to be mutable
let mut b = (&mut a,); //~ ERROR: variable does not need to be mutable
*b.0 = 4;

let mut x = &mut 1; //~ ERROR: variable does not need to be mutable

let mut x = &mut 1; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let mut f = || {
*x += 1;
};
f();

fn mut_ref_arg(mut arg : &mut [u8]) -> &mut [u8] {
&mut arg[..] //[lexical]~^ ERROR: variable does not need to be mutable
//[nll]~^^ ERROR: variable does not need to be mutable
&mut arg[..] //~^ ERROR: variable does not need to be mutable

}

let mut v : &mut Vec<()> = &mut vec![]; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let mut v : &mut Vec<()> = &mut vec![]; //~ ERROR: variable does not need to be mutable

v.push(());

// positive cases
Expand Down Expand Up @@ -140,6 +140,6 @@ fn foo(mut a: isize) {
fn bar() {
#[allow(unused_mut)]
let mut a = 3;
let mut b = vec![2]; //[lexical]~ ERROR: variable does not need to be mutable
//[nll]~^ ERROR: variable does not need to be mutable
let mut b = vec![2]; //~ ERROR: variable does not need to be mutable

}
Loading

0 comments on commit 918f70f

Please sign in to comment.