Skip to content

Commit 611c94d

Browse files
committed
auto merge of rust-lang#10134 : reedlepee123/rust/priv_fields, r=brson
2 parents 886819c + b5e0738 commit 611c94d

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,8 @@ pub fn Parser(sess: @mut ParseSess,
309309
quote_depth: @mut 0,
310310
obsolete_set: @mut HashSet::new(),
311311
mod_path_stack: @mut ~[],
312-
open_braces: @mut ~[]
312+
open_braces: @mut ~[],
313+
non_copyable: util::NonCopyable
313314
}
314315
}
315316

@@ -339,13 +340,9 @@ pub struct Parser {
339340
/// Used to determine the path to externally loaded source files
340341
mod_path_stack: @mut ~[@str],
341342
/// Stack of spans of open delimiters. Used for error message.
342-
open_braces: @mut ~[Span]
343-
}
344-
345-
#[unsafe_destructor]
346-
impl Drop for Parser {
343+
open_braces: @mut ~[Span],
347344
/* do not copy the parser; its state is tied to outside state */
348-
fn drop(&mut self) {}
345+
priv non_copyable: util::NonCopyable
349346
}
350347

351348
fn is_plain_ident_or_underscore(t: &token::Token) -> bool {

0 commit comments

Comments
 (0)