diff options
| author | bors <bors@rust-lang.org> | 2019-11-07 07:55:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-07 07:55:39 +0000 |
| commit | 50f8aadd746ebc929a752e5ffb133936ee75c52f (patch) | |
| tree | 47453a165c08c24ca9b3224506ff74a2f8b053e5 /src/libsyntax/parse/parser/path.rs | |
| parent | 7a76fe76f756895b8cda1e10398f2268656a2e0f (diff) | |
| parent | c9eae9ea63abe57d8bb91905d5ca4cff8dd8ea56 (diff) | |
| download | rust-50f8aadd746ebc929a752e5ffb133936ee75c52f.tar.gz rust-50f8aadd746ebc929a752e5ffb133936ee75c52f.zip | |
Auto merge of #66180 - Centril:rollup-c1ji943, r=Centril
Rollup of 5 pull requests Successful merges: - #59789 (Revert two unapproved changes to rustc_typeck.) - #65752 (Use structured suggestions for missing associated items) - #65884 (syntax: ABI-oblivious grammar) - #65974 (A scheme for more macro-matcher friendly pre-expansion gating) - #66017 (Add future incompatibility lint for `array.into_iter()`) Failed merges: - #66056 (rustc_metadata: Some reorganization of the module structure) r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser/path.rs')
| -rw-r--r-- | src/libsyntax/parse/parser/path.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser/path.rs b/src/libsyntax/parse/parser/path.rs index f9944e36e2f..4438d61d9ee 100644 --- a/src/libsyntax/parse/parser/path.rs +++ b/src/libsyntax/parse/parser/path.rs @@ -5,7 +5,7 @@ use crate::ast::{self, QSelf, Path, PathSegment, Ident, ParenthesizedArgs, Angle use crate::ast::{AnonConst, GenericArg, AssocTyConstraint, AssocTyConstraintKind, BlockCheckMode}; use crate::parse::token::{self, Token}; use crate::source_map::{Span, BytePos}; -use crate::symbol::kw; +use syntax_pos::symbol::{kw, sym}; use std::mem; use log::debug; @@ -426,7 +426,7 @@ impl<'a> Parser<'a> { // Gate associated type bounds, e.g., `Iterator<Item: Ord>`. if let AssocTyConstraintKind::Bound { .. } = kind { - self.sess.gated_spans.associated_type_bounds.borrow_mut().push(span); + self.sess.gated_spans.gate(sym::associated_type_bounds, span); } constraints.push(AssocTyConstraint { |
