]> git.lizzy.rs Git - rust.git/commitdiff
Allow declaring existential types inside blocks
authorOliver Schneider <github35764891676564198441@oli-obk.de>
Mon, 23 Jul 2018 12:56:36 +0000 (14:56 +0200)
committerOliver Schneider <github35764891676564198441@oli-obk.de>
Tue, 24 Jul 2018 08:07:45 +0000 (10:07 +0200)
src/libsyntax/parse/parser.rs
src/test/ui/impl-trait/existential_type_in_fn_body.rs [new file with mode: 0644]

index 2eaa56ebeb82649548d733ea7687f0d8d8879d96..564eba0a553fa2e5823058884106a7297c40d90b 100644 (file)
@@ -4391,6 +4391,11 @@ fn is_extern_non_path(&self) -> bool {
         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)
@@ -4495,6 +4500,7 @@ fn parse_stmt_without_recovery(&mut self,
                   !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)?;
 
diff --git a/src/test/ui/impl-trait/existential_type_in_fn_body.rs b/src/test/ui/impl-trait/existential_type_in_fn_body.rs
new file mode 100644 (file)
index 0000000..20f9e0d
--- /dev/null
@@ -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());
+}