about summary refs log tree commit diff
path: root/compiler/rustc_parse/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-11-22 15:40:03 +0000
committerbors <bors@rust-lang.org>2020-11-22 15:40:03 +0000
commit52e3cf13aa9716f6648b1cad286ccd8d37aa315f (patch)
tree73c2ccb909d6813b4b5edf03bfdd4e5df77423e8 /compiler/rustc_parse/src
parent828461b4b27c4a955587887936e54057efc5e2c1 (diff)
parent749fe400c85687172aff3ca8e4436b1f32352348 (diff)
downloadrust-52e3cf13aa9716f6648b1cad286ccd8d37aa315f.tar.gz
rust-52e3cf13aa9716f6648b1cad286ccd8d37aa315f.zip
Auto merge of #79306 - GuillaumeGomez:rollup-4cnudfj, r=GuillaumeGomez
Rollup of 4 pull requests

Successful merges:

 - #78670 (Remove FIXME comment in some incremental test suite)
 - #79292 (Fix typo in doc comment for report_too_many_hashes)
 - #79300 (Prevent feature information to be hidden if it's on the impl directly)
 - #79302 (Add regression test for issue 73899)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
-rw-r--r--compiler/rustc_parse/src/lexer/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/lexer/mod.rs b/compiler/rustc_parse/src/lexer/mod.rs
index 0dfacd78908..b5b34c7338d 100644
--- a/compiler/rustc_parse/src/lexer/mod.rs
+++ b/compiler/rustc_parse/src/lexer/mod.rs
@@ -510,7 +510,7 @@ impl<'a> StringReader<'a> {
         FatalError.raise()
     }
 
-    /// Note: It was decided to not add a test case, because it would be to big.
+    /// Note: It was decided to not add a test case, because it would be too big.
     /// <https://github.com/rust-lang/rust/pull/50296#issuecomment-392135180>
     fn report_too_many_hashes(&self, start: BytePos, found: usize) -> ! {
         self.fatal_span_(