Merge #357

357: Fix tests for minor message change in 1.32. r=ehuss a=ehuss



Co-authored-by: Eric Huss <[email protected]>

Author: bors[bot]

.travis.yml

@@ -43,13 +43,13 @@ install:
   # Pin a known good version of nightly and clippy.
   - >
     if [ "$TRAVIS_RUST_VERSION" != "nightly" ]; then
-      rustup install nightly-2018-08-04;
+      rustup install nightly-2018-12-05;
       host=$(rustc -Vv | grep ^host: | sed -e "s/host: //g");
       toolchains=$(dirname $(dirname $(dirname $(rustup which rustc))));
       mv $toolchains/nightly-* $toolchains/nightly-$host;
     fi
   # Install Rust packages needed by integration tests.
-  - rustup component add clippy-preview --toolchain=nightly
+  - rustup component add clippy --toolchain=nightly
   - cargo install cargo-script
 
 

tests/error-tests/tests/macro-expansion-outside-1.rs

@@ -14,6 +14,7 @@ extern crate dcrate;
 // ~ERR(>=1.20.0) /expected one of .*, found `:`/
 // ~ERR(>=1.20.0) this error originates in a macro outside of the current crate
 // ~ERR(>=1.20.0) expected one of
+// ~ERR(>=1.32.0-beta) in this macro
 // ~ERR(>=1.20.0,<1.24.0-beta) unexpected token
 // end-msg: ERR(>=1.19.0,<1.20.0-beta) /expected one of .*, found `:`/
 // end-msg: ERR(>=1.19.0,<1.20.0-beta) Errors occurred in macro <example_bad_syntax macros> from external crate