diff options
| author | bors <bors@rust-lang.org> | 2019-11-08 15:52:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-08 15:52:14 +0000 |
| commit | 9e346646e93cc243567e27bb0f4e8716d56ad1f1 (patch) | |
| tree | 32241bdad56a558bbfa93093ba4cc65797df3498 /src/libsyntax/parse/parser/diagnostics.rs | |
| parent | 76ade3e8ac42cd7a7b7c3c5ef54818ab68e3ebdc (diff) | |
| parent | 65c77bc09ab38b3d9377168d673ed7b0a2c1e0c3 (diff) | |
| download | rust-9e346646e93cc243567e27bb0f4e8716d56ad1f1.tar.gz rust-9e346646e93cc243567e27bb0f4e8716d56ad1f1.zip | |
Auto merge of #66225 - Centril:rollup-it0t5tk, r=Centril
Rollup of 5 pull requests
Successful merges:
- #65785 (Transition future compat lints to {ERROR, DENY} - Take 2)
- #66007 (Remove "here" from "expected one of X here")
- #66043 (rename Memory::get methods to get_raw to indicate their unchecked nature)
- #66154 (miri: Rename to_{u,i}size to to_machine_{u,i}size)
- #66188 (`MethodSig` -> `FnSig` & Use it in `ItemKind::Fn`)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser/diagnostics.rs')
| -rw-r--r-- | src/libsyntax/parse/parser/diagnostics.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser/diagnostics.rs b/src/libsyntax/parse/parser/diagnostics.rs index 26d7f48025e..5df24804a76 100644 --- a/src/libsyntax/parse/parser/diagnostics.rs +++ b/src/libsyntax/parse/parser/diagnostics.rs @@ -287,7 +287,7 @@ impl<'a> Parser<'a> { }; (format!("expected one of {}, found {}", expect, actual), (self.sess.source_map().next_point(self.prev_span), - format!("expected one of {} here", short_expect))) + format!("expected one of {}", short_expect))) } else if expected.is_empty() { (format!("unexpected token: {}", actual), (self.prev_span, "unexpected token after this".to_string())) |