auto merge of #10134 : reedlepee123/rust/priv_fields, r=brson

This commit is contained in:
bors 2013-10-29 15:11:30 -07:00
commit 611c94d984
1 changed files with 4 additions and 7 deletions

View File

@ -309,7 +309,8 @@ pub fn Parser(sess: @mut ParseSess,
quote_depth: @mut 0,
obsolete_set: @mut HashSet::new(),
mod_path_stack: @mut ~[],
open_braces: @mut ~[]
open_braces: @mut ~[],
non_copyable: util::NonCopyable
}
}
@ -339,13 +340,9 @@ pub struct Parser {
/// Used to determine the path to externally loaded source files
mod_path_stack: @mut ~[@str],
/// Stack of spans of open delimiters. Used for error message.
open_braces: @mut ~[Span]
}
#[unsafe_destructor]
impl Drop for Parser {
open_braces: @mut ~[Span],
/* do not copy the parser; its state is tied to outside state */
fn drop(&mut self) {}
priv non_copyable: util::NonCopyable
}
fn is_plain_ident_or_underscore(t: &token::Token) -> bool {