about summary refs log tree commit diff
path: root/compiler/rustc_parse/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-09-01 03:26:55 +0000
committerbors <bors@rust-lang.org>2020-09-01 03:26:55 +0000
commit445f34bb144c5b163163d8243e9845c644d3662d (patch)
tree0109fbe74144d5f4f11b9f435808edcb34756750 /compiler/rustc_parse/src
parentd824b2351449714dc685d90e298c9d630ad6c437 (diff)
parent8d328d785fc9e1242ff4c6e390ccd276a09221da (diff)
downloadrust-445f34bb144c5b163163d8243e9845c644d3662d.tar.gz
rust-445f34bb144c5b163163d8243e9845c644d3662d.zip
Auto merge of #76186 - tmandry:rollup-49nliiy, r=tmandry
Rollup of 12 pull requests

Successful merges:

 - #75945 (Use `env::func()`, not 'the function env::func' in docs for std::env)
 - #76002 (Fix `-Z instrument-coverage` on MSVC)
 - #76003 (Adds two source span utility functions used in source-based coverage)
 - #76059 (Clean up E0764)
 - #76103 (Clean up E0769)
 - #76139 (Make `cow_is_borrowed` methods const)
 - #76154 (Fix rustdoc strings indentation)
 - #76161 (Remove notrust in rustc_middle)
 - #76163 (README: Adjust Linux and macOS support platform and architecture)
 - #76166 (Make `StringReader` private)
 - #76172 (Revert #75463)
 - #76178 (Update expect-test to 1.0)

Failed merges:

r? @ghost
Diffstat (limited to 'compiler/rustc_parse/src')
-rw-r--r--compiler/rustc_parse/src/lexer/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_parse/src/lexer/mod.rs b/compiler/rustc_parse/src/lexer/mod.rs
index c4ef35bc30c..1131f00cb42 100644
--- a/compiler/rustc_parse/src/lexer/mod.rs
+++ b/compiler/rustc_parse/src/lexer/mod.rs
@@ -27,7 +27,7 @@ pub struct UnmatchedBrace {
     pub candidate_span: Option<Span>,
 }
 
-pub struct StringReader<'a> {
+crate struct StringReader<'a> {
     sess: &'a ParseSess,
     /// Initial position, read-only.
     start_pos: BytePos,
@@ -41,7 +41,7 @@ pub struct StringReader<'a> {
 }
 
 impl<'a> StringReader<'a> {
-    pub fn new(
+    crate fn new(
         sess: &'a ParseSess,
         source_file: Lrc<rustc_span::SourceFile>,
         override_span: Option<Span>,
@@ -66,7 +66,7 @@ impl<'a> StringReader<'a> {
     }
 
     /// Returns the next token, including trivia like whitespace or comments.
-    pub fn next_token(&mut self) -> Token {
+    fn next_token(&mut self) -> Token {
         let start_src_index = self.src_index(self.pos);
         let text: &str = &self.src[start_src_index..self.end_src_index];