diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs index 0194e8f009c6a..9c3bf04b2a8f5 100644 --- a/src/libcore/prelude.rs +++ b/src/libcore/prelude.rs @@ -21,6 +21,10 @@ pub use ops::{Shl, Shr, Index}; pub use option::{Option, Some, None}; pub use result::{Result, Ok, Err}; +/* Reexported functions */ + +pub use io::{print, println}; + /* Reexported types and traits */ pub use clone::Clone; diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 51a7f7fbd1c0a..c52162b7f14ed 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3107,11 +3107,15 @@ pub impl Parser { // XXX: clownshoes let ident = special_idents::clownshoes_extensions; + // Special case: if the next identifier that follows is '(', don't + // allow this to be parsed as a trait. + let could_be_trait = *self.token != token::LPAREN; + // Parse the trait. let mut ty = self.parse_ty(false); // Parse traits, if necessary. - let opt_trait = if self.eat_keyword(&~"for") { + let opt_trait = if could_be_trait && self.eat_keyword(&~"for") { // New-style trait. Reinterpret the type as a trait. let opt_trait_ref = match ty.node { ty_path(path, node_id) => {