diff options
| author | bors <bors@rust-lang.org> | 2019-10-14 10:00:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-14 10:00:51 +0000 |
| commit | 446e5e57b667c841ba3ebb4b41b44fb98bd3af4b (patch) | |
| tree | b6cc0036da62d65162168901c85cf368d8ed440d /src/libsyntax/parse/parser/ty.rs | |
| parent | d28a9c38fe14396e86ae274c7847e20ee0f78ca9 (diff) | |
| parent | a73e0731f45577bb6b760fe5d8d328de2021a74f (diff) | |
| download | rust-446e5e57b667c841ba3ebb4b41b44fb98bd3af4b.tar.gz rust-446e5e57b667c841ba3ebb4b41b44fb98bd3af4b.zip | |
Auto merge of #65399 - Centril:rollup-6lzj0w5, r=Centril
Rollup of 7 pull requests Successful merges: - #65215 (Add long error explanation for E0697) - #65292 (Print lifetimes with backticks) - #65362 (syntax: consolidate function parsing in item.rs) - #65363 (Remove implicit dependencies on syntax::pprust) - #65379 (refactor session::config::build_session_options_and_crate_config) - #65392 (Move `Nonterminal::to_tokenstream` to parser & don't rely directly on parser in lowering) - #65395 (Add some tests for fixed ICEs) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse/parser/ty.rs')
| -rw-r--r-- | src/libsyntax/parse/parser/ty.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser/ty.rs b/src/libsyntax/parse/parser/ty.rs index 018b5951e6e..e696ab0804d 100644 --- a/src/libsyntax/parse/parser/ty.rs +++ b/src/libsyntax/parse/parser/ty.rs @@ -1,4 +1,5 @@ use super::{Parser, PResult, PathStyle, PrevTokenKind, TokenType}; +use super::item::ParamCfg; use crate::{maybe_whole, maybe_recover_from_interpolated_ty_qpath}; use crate::ptr::P; @@ -281,7 +282,7 @@ impl<'a> Parser<'a> { let unsafety = self.parse_unsafety(); let abi = self.parse_extern_abi()?; self.expect_keyword(kw::Fn)?; - let cfg = super::ParamCfg { + let cfg = ParamCfg { is_self_allowed: false, allow_c_variadic: true, is_name_required: |_| false, |