diff options
| author | bors <bors@rust-lang.org> | 2018-06-12 11:06:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-12 11:06:09 +0000 |
| commit | a1aae290d5560b45353071dc5be7554df5e6f72b (patch) | |
| tree | 0ff7e947c281bd88976a72ed14c10be6569ac4af /src/libsyntax/parse | |
| parent | 56d9bfdf7788d68656997571f77425de78bb21e4 (diff) | |
| parent | 6fd9ede0cd3a3c73e44a8fdbbb3cabfb622d2a7f (diff) | |
| download | rust-a1aae290d5560b45353071dc5be7554df5e6f72b.tar.gz rust-a1aae290d5560b45353071dc5be7554df5e6f72b.zip | |
Auto merge of #51508 - PSeitz:master, r=Mark-Simulacrum
Make span_fatal and parse_block public span_fatal and parse_block were made private in #51265. These methods are used in stainless. Related #51498 #51504
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 36ae54a509e..092564d158f 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1198,7 +1198,7 @@ impl<'a> Parser<'a> { pub fn fatal(&self, m: &str) -> DiagnosticBuilder<'a> { self.sess.span_diagnostic.struct_span_fatal(self.span, m) } - fn span_fatal<S: Into<MultiSpan>>(&self, sp: S, m: &str) -> DiagnosticBuilder<'a> { + pub fn span_fatal<S: Into<MultiSpan>>(&self, sp: S, m: &str) -> DiagnosticBuilder<'a> { self.sess.span_diagnostic.struct_span_fatal(sp, m) } fn span_fatal_err<S: Into<MultiSpan>>(&self, sp: S, err: Error) -> DiagnosticBuilder<'a> { @@ -2469,7 +2469,7 @@ impl<'a> Parser<'a> { } /// Parse a block or unsafe block - fn parse_block_expr(&mut self, opt_label: Option<Label>, + pub fn parse_block_expr(&mut self, opt_label: Option<Label>, lo: Span, blk_mode: BlockCheckMode, outer_attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> { |