Skip to content

Commit

Permalink
auto merge of #10134 : reedlepee123/rust/priv_fields, r=brson
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Oct 29, 2013
2 parents 886819c + b5e0738 commit 611c94d
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 611c94d

Please sign in to comment.