Skip to content

Commit

Permalink
Rollup merge of rust-lang#52645 - oli-obk:existential_in_fn_body, r=d…
Browse files Browse the repository at this point in the history
…tolnay

Allow declaring existential types inside blocks

fixes rust-lang#52631

r? @dtolnay
  • Loading branch information
Mark-Simulacrum authored Jul 24, 2018
2 parents dab595e + 2e33a55 commit f930017
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4391,6 +4391,11 @@ impl<'a> Parser<'a> {
self.token.is_keyword(keywords::Extern) && self.look_ahead(1, |t| t != &token::ModSep)
}

fn is_existential_type_decl(&self) -> bool {
self.token.is_keyword(keywords::Existential) &&
self.look_ahead(1, |t| t.is_keyword(keywords::Type))
}

fn is_auto_trait_item(&mut self) -> bool {
// auto trait
(self.token.is_keyword(keywords::Auto)
Expand Down Expand Up @@ -4495,6 +4500,7 @@ impl<'a> Parser<'a> {
!self.is_union_item() &&
!self.is_crate_vis() &&
!self.is_extern_non_path() &&
!self.is_existential_type_decl() &&
!self.is_auto_trait_item() {
let pth = self.parse_path(PathStyle::Expr)?;

Expand Down
22 changes: 22 additions & 0 deletions src/test/ui/impl-trait/existential_type_in_fn_body.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-pass

#![feature(existential_type)]

use std::fmt::Debug;

fn main() {
existential type Existential: Debug;

fn f() -> Existential {}
println!("{:?}", f());
}

0 comments on commit f930017

Please sign in to comment.