diff options
| author | bors <bors@rust-lang.org> | 2019-09-23 06:38:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-23 06:38:23 +0000 |
| commit | 66bf391c3aabfc77f5f7139fc9e6944f995d574e (patch) | |
| tree | 196ef2334e2f7787737af02f2e78ed53c10fb5a8 /src/libsyntax/parse/parser/expr.rs | |
| parent | b6716a1cdd7ad8eab93c9e25e7832a3c0f744d64 (diff) | |
| parent | 4cc5aaada2f8ffd444a7fbb10394b83ba3156525 (diff) | |
| download | rust-66bf391c3aabfc77f5f7139fc9e6944f995d574e.tar.gz rust-66bf391c3aabfc77f5f7139fc9e6944f995d574e.zip | |
Auto merge of #64272 - Mark-Simulacrum:parallel-handler, r=estebank
Refactor librustc_errors::Handler API This should be reviewed by-commit. The last commit moves all fields into an inner struct behind a single lock; this is done to prevent possible deadlocks in a multi-threaded compiler, as well as inconsistent state observation.
Diffstat (limited to 'src/libsyntax/parse/parser/expr.rs')
| -rw-r--r-- | src/libsyntax/parse/parser/expr.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser/expr.rs b/src/libsyntax/parse/parser/expr.rs index 41c3747b950..d0c865a7b8e 100644 --- a/src/libsyntax/parse/parser/expr.rs +++ b/src/libsyntax/parse/parser/expr.rs @@ -777,7 +777,7 @@ impl<'a> Parser<'a> { ex = ExprKind::Lit(literal); } Err(mut err) => { - self.cancel(&mut err); + err.cancel(); return Err(self.expected_expression_found()); } } |
