diff options
| author | bors <bors@rust-lang.org> | 2019-04-04 15:36:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-04 15:36:17 +0000 |
| commit | 52980d0fb39134a26f73b39b384407e010fc3af5 (patch) | |
| tree | c0e48c613747cfef892c45a792235d84c25e92b4 /src/libsyntax/parse | |
| parent | 2d065712cf96328093400fd0a1a0c4e0f3b1d51c (diff) | |
| parent | 31c2f5d228cd662f7696de666ba98732a1d3be08 (diff) | |
| download | rust-52980d0fb39134a26f73b39b384407e010fc3af5.tar.gz rust-52980d0fb39134a26f73b39b384407e010fc3af5.zip | |
Auto merge of #59695 - Centril:rollup-88qffc2, r=Centril
Rollup of 8 pull requests Successful merges: - #59470 (Document std::fs::File close behavior ignoring errors) - #59555 (update miri) - #59556 (update stdsimd) - #59596 (Forward formatter settings to bounds of `Range<T>` in `fmt::Debug` impl) - #59639 (Never return uninhabited values at all) - #59671 (Make some of lexer's API private) - #59685 (Add description for -Os and -Oz in rustc.1) - #59686 (Temporarily disable stack probing for gnux32.) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index cd4944deadb..d0162ef1704 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -43,16 +43,16 @@ pub struct UnmatchedBrace { } pub struct StringReader<'a> { - pub sess: &'a ParseSess, + crate sess: &'a ParseSess, /// The absolute offset within the source_map of the next character to read - pub next_pos: BytePos, + crate next_pos: BytePos, /// The absolute offset within the source_map of the current character - pub pos: BytePos, + crate pos: BytePos, /// The current character (which has been read from self.pos) - pub ch: Option<char>, - pub source_file: Lrc<syntax_pos::SourceFile>, + crate ch: Option<char>, + crate source_file: Lrc<syntax_pos::SourceFile>, /// Stop reading src at this index. - pub end_src_index: usize, + crate end_src_index: usize, // cached: peek_tok: token::Token, peek_span: Span, @@ -126,7 +126,7 @@ impl<'a> StringReader<'a> { } /// Immutably extract string if found at current position with given delimiters - pub fn peek_delimited(&self, from_ch: char, to_ch: char) -> Option<String> { + fn peek_delimited(&self, from_ch: char, to_ch: char) -> Option<String> { let mut pos = self.pos; let mut idx = self.src_index(pos); let mut ch = char_at(&self.src, idx); @@ -191,7 +191,7 @@ impl<'a> StringReader<'a> { self.fatal_span(self.peek_span, m) } - pub fn emit_fatal_errors(&mut self) { + crate fn emit_fatal_errors(&mut self) { for err in &mut self.fatal_errs { err.emit(); } |
