Merge pull request Manishearth#183 from laumann/fix-tests

Fix tests

Author: Munksgaard

appveyor.yml

@@ -8,7 +8,8 @@ environment:
 install:
   - curl -sSf -o rustup-init.exe https://win.rustup.rs
   - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin
+  - gcc --version
   - rustc -Vv
   - cargo -V
 

test-project/tests/compile-fail/mut-suggestion.rs

@@ -17,14 +17,14 @@ impl S {
 }
 
 fn func(arg: S) {
-    //~^ HELP make this binding mutable
-    arg.mutate(); //~ ERROR cannot borrow immutable argument
-                  //~| NOTE cannot borrow mutably
+    //~^ HELP consider changing this to be mutable
+    arg.mutate(); //~ ERROR cannot borrow `arg` as mutable
+                  //~| NOTE cannot borrow as mutable
 }
 
 fn main() {
     let local = S;
-    //~^ HELP make this binding mutable
-    local.mutate(); //~ ERROR cannot borrow immutable local variable
-                    //~| NOTE cannot borrow mutably
+    //~^ HELP consider changing this to be mutable
+    local.mutate(); //~ ERROR cannot borrow `local` as mutable
+                    //~| NOTE cannot borrow as mutable
 }

test-project/tests/compile-fail/trait-bounds-cant-coerce.rs

@@ -13,14 +13,14 @@ trait Foo {
     fn dummy(&self) { }
 }
 
-fn a(_x: Box<Foo+Send>) {
+fn a(_x: Box<dyn Foo+Send>) {
 }
 
-fn c(x: Box<Foo+Sync+Send>) {
+fn c(x: Box<dyn Foo+Sync+Send>) {
     a(x);
 }
 
-fn d(x: Box<Foo>) {
+fn d(x: Box<dyn Foo>) {
     a(x); //~  ERROR mismatched types
           //~| expected trait `Foo + std::marker::Send`, found trait `Foo`
           //~| expected type `std::boxed::Box<(dyn Foo + std::marker::Send + 'static)>`

test-project/tests/pretty/macro.pp

@@ -8,6 +8,6 @@
 // pretty-mode:expanded
 // pp-exact:macro.pp
 
-macro_rules! square(( $ x : expr ) => { $ x * $ x } ;);
+macro_rules! square { ($ x : expr) => { $ x * $ x } ; }
 
 fn f() -> i8 { 5 * 5 }