Fix tests and fallout

Author: alexcrichton

src/libsyntax/parse/parser.rs

@@ -1752,7 +1752,7 @@ impl<'a> Parser<'a> {
         -> PResult<'a, ast::Path>
     {
         maybe_whole!(self, NtPath, |path| {
-            if style == PathStyle::Mod &&
+            if mode == PathStyle::Mod &&
                path.segments.iter().any(|segment| segment.parameters.is_some()) {
                 self.diagnostic().span_err(path.span, "unexpected generic arguments in path");
             }

src/test/compile-fail/import-ty-params.rs

@@ -20,6 +20,6 @@ macro_rules! import {
     ($p: path) => (use $p;);
 }
 
-import! { a::b::c::S<u8> } //~ERROR type or lifetime parameters in import path
+import! { a::b::c::S<u8> } //~ERROR unexpected generic arguments in path
 
 fn main() {}

src/test/compile-fail/privacy/restricted/ty-params.rs

@@ -13,7 +13,7 @@ macro_rules! m {
 }
 
 struct S<T>(T);
-m!{ S<u8> } //~ ERROR type or lifetime parameters in visibility path
+m!{ S<u8> } //~ ERROR unexpected generic arguments in path
 //~^ ERROR expected module, found struct `S`
 
 fn main() {}