diff options
| author | bors <bors@rust-lang.org> | 2020-08-19 06:59:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-19 06:59:13 +0000 |
| commit | 5b04bbfcbb79ed7325ea2b580458a80d95da6bbb (patch) | |
| tree | 54f153779798d43bf66667e385982b6d2f9f9711 /src/librustc_parse/parser/expr.rs | |
| parent | c03c213daf5fe3b52c768b4f145e45d8994d87ea (diff) | |
| parent | 07ea340e89a4938a26039bceac6dbc1376978a48 (diff) | |
| download | rust-5b04bbfcbb79ed7325ea2b580458a80d95da6bbb.tar.gz rust-5b04bbfcbb79ed7325ea2b580458a80d95da6bbb.zip | |
Auto merge of #75692 - JohnTitor:rollup-8gr04ah, r=JohnTitor
Rollup of 9 pull requests
Successful merges:
- #75038 (See also X-Link mem::{swap, take, replace})
- #75049 (docs(marker/copy): provide example for `&T` being `Copy`)
- #75499 (Fix documentation error)
- #75554 (Fix clashing_extern_declarations stack overflow for recursive types.)
- #75646 (Move to intra doc links for keyword documentation)
- #75652 (Resolve true and false as booleans)
- #75658 (Don't emit "is not a logical operator" error outside of associative expressions)
- #75665 (Add doc examples coverage)
- #75685 (Switch to intra-doc links in /src/sys/unix/ext/*.rs)
Failed merges:
r? @ghost
Diffstat (limited to 'src/librustc_parse/parser/expr.rs')
| -rw-r--r-- | src/librustc_parse/parser/expr.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_parse/parser/expr.rs b/src/librustc_parse/parser/expr.rs index e5c28f225c6..62aec66a255 100644 --- a/src/librustc_parse/parser/expr.rs +++ b/src/librustc_parse/parser/expr.rs @@ -308,7 +308,7 @@ impl<'a> Parser<'a> { } fn should_continue_as_assoc_expr(&mut self, lhs: &Expr) -> bool { - match (self.expr_is_complete(lhs), self.check_assoc_op().map(|op| op.node)) { + match (self.expr_is_complete(lhs), AssocOp::from_token(&self.token)) { // Semi-statement forms are odd: // See https://github.com/rust-lang/rust/issues/29071 (true, None) => false, |