Merge pull request #2400 from csmoe/support_immovable_generators

Support immovable generators

Author: topecongiro

Cargo.lock

@@ -44,8 +44,8 @@ env_logger = "0.4"
 getopts = "0.2"
 derive-new = "0.5"
 cargo_metadata = "0.4"
-rustc-ap-syntax = "12.0.0"
-rustc-ap-rustc_errors = "12.0.0"
+rustc-ap-syntax = "26.0.0"
+rustc-ap-rustc_errors = "26.0.0"
 
 [dev-dependencies]
 lazy_static = "1.0.0"

Cargo.toml

@@ -33,6 +33,7 @@ use utils::{last_line_width, left_most_sub_expr, stmt_expr};
 
 pub fn rewrite_closure(
     capture: ast::CaptureBy,
+    movability: ast::Movability,
     fn_decl: &ast::FnDecl,
     body: &ast::Expr,
     span: Span,
@@ -42,7 +43,7 @@ pub fn rewrite_closure(
     debug!("rewrite_closure {:?}", body);
 
     let (prefix, extra_offset) =
-        rewrite_closure_fn_decl(capture, fn_decl, body, span, context, shape)?;
+        rewrite_closure_fn_decl(capture, movability, fn_decl, body, span, context, shape)?;
     // 1 = space between `|...|` and body.
     let body_shape = shape.offset_left(extra_offset)?;
 
@@ -194,6 +195,7 @@ fn rewrite_closure_block(
 // Return type is (prefix, extra_offset)
 fn rewrite_closure_fn_decl(
     capture: ast::CaptureBy,
+    movability: ast::Movability,
     fn_decl: &ast::FnDecl,
     body: &ast::Expr,
     span: Span,
@@ -205,9 +207,17 @@ fn rewrite_closure_fn_decl(
     } else {
         ""
     };
+
+    let immovable = if movability == ast::Movability::Static {
+        "static "
+    } else {
+        ""
+    };
     // 4 = "|| {".len(), which is overconservative when the closure consists of
     // a single expression.
-    let nested_shape = shape.shrink_left(mover.len())?.sub_width(4)?;
+    let nested_shape = shape
+        .shrink_left(mover.len() + immovable.len())?
+        .sub_width(4)?;
 
     // 1 = |
     let argument_offset = nested_shape.indent + 1;
@@ -254,7 +264,7 @@ fn rewrite_closure_fn_decl(
         config: context.config,
     };
     let list_str = write_list(&item_vec, &fmt)?;
-    let mut prefix = format!("{}|{}|", mover, list_str);
+    let mut prefix = format!("{}{}|{}|", immovable, mover, list_str);
 
     if !ret_str.is_empty() {
         if prefix.contains('\n') {
@@ -278,7 +288,7 @@ pub fn rewrite_last_closure(
     expr: &ast::Expr,
     shape: Shape,
 ) -> Option<String> {
-    if let ast::ExprKind::Closure(capture, ref fn_decl, ref body, _) = expr.node {
+    if let ast::ExprKind::Closure(capture, movability, ref fn_decl, ref body, _) = expr.node {
         let body = match body.node {
             ast::ExprKind::Block(ref block)
                 if !is_unsafe_block(block) && is_simple_block(block, context.codemap) =>
@@ -287,8 +297,15 @@ pub fn rewrite_last_closure(
             }
             _ => body,
         };
-        let (prefix, extra_offset) =
-            rewrite_closure_fn_decl(capture, fn_decl, body, expr.span, context, shape)?;
+        let (prefix, extra_offset) = rewrite_closure_fn_decl(
+            capture,
+            movability,
+            fn_decl,
+            body,
+            expr.span,
+            context,
+            shape,
+        )?;
         // If the closure goes multi line before its body, do not overflow the closure.
         if prefix.contains('\n') {
             return None;

src/closures.rs

@@ -135,16 +135,16 @@ pub fn format_expr(
         ast::ExprKind::AssignOp(ref op, ref lhs, ref rhs) => {
             rewrite_assignment(context, lhs, rhs, Some(op), shape)
         }
-        ast::ExprKind::Continue(ref opt_ident) => {
-            let id_str = match *opt_ident {
-                Some(ident) => format!(" {}", ident.node),
+        ast::ExprKind::Continue(ref opt_label) => {
+            let id_str = match *opt_label {
+                Some(label) => format!(" {}", label.ident),
                 None => String::new(),
             };
             Some(format!("continue{}", id_str))
         }
-        ast::ExprKind::Break(ref opt_ident, ref opt_expr) => {
-            let id_str = match *opt_ident {
-                Some(ident) => format!(" {}", ident.node),
+        ast::ExprKind::Break(ref opt_label, ref opt_expr) => {
+            let id_str = match *opt_label {
+                Some(label) => format!(" {}", label.ident),
                 None => String::new(),
             };
 
@@ -159,8 +159,16 @@ pub fn format_expr(
         } else {
             Some("yield".to_string())
         },
-        ast::ExprKind::Closure(capture, ref fn_decl, ref body, _) => {
-            closures::rewrite_closure(capture, fn_decl, body, expr.span, context, shape)
+        ast::ExprKind::Closure(capture, movability, ref fn_decl, ref body, _) => {
+            closures::rewrite_closure(
+                capture,
+                movability,
+                fn_decl,
+                body,
+                expr.span,
+                context,
+                shape,
+            )
         }
         ast::ExprKind::Try(..)
         | ast::ExprKind::Field(..)
@@ -718,7 +726,7 @@ struct ControlFlow<'a> {
     cond: Option<&'a ast::Expr>,
     block: &'a ast::Block,
     else_block: Option<&'a ast::Expr>,
-    label: Option<ast::SpannedIdent>,
+    label: Option<ast::Label>,
     pat: Option<&'a ast::Pat>,
     keyword: &'a str,
     matcher: &'a str,
@@ -795,11 +803,7 @@ impl<'a> ControlFlow<'a> {
         }
     }
 
-    fn new_loop(
-        block: &'a ast::Block,
-        label: Option<ast::SpannedIdent>,
-        span: Span,
-    ) -> ControlFlow<'a> {
+    fn new_loop(block: &'a ast::Block, label: Option<ast::Label>, span: Span) -> ControlFlow<'a> {
         ControlFlow {
             cond: None,
             block: block,
@@ -819,7 +823,7 @@ impl<'a> ControlFlow<'a> {
         pat: Option<&'a ast::Pat>,
         cond: &'a ast::Expr,
         block: &'a ast::Block,
-        label: Option<ast::SpannedIdent>,
+        label: Option<ast::Label>,
         span: Span,
     ) -> ControlFlow<'a> {
         ControlFlow {
@@ -844,7 +848,7 @@ impl<'a> ControlFlow<'a> {
         pat: &'a ast::Pat,
         cond: &'a ast::Expr,
         block: &'a ast::Block,
-        label: Option<ast::SpannedIdent>,
+        label: Option<ast::Label>,
         span: Span,
     ) -> ControlFlow<'a> {
         ControlFlow {
@@ -1166,9 +1170,9 @@ impl<'a> Rewrite for ControlFlow<'a> {
     }
 }
 
-fn rewrite_label(label: Option<ast::SpannedIdent>) -> Cow<'static, str> {
-    match label {
-        Some(ident) => Cow::from(format!("{}: ", ident.node)),
+fn rewrite_label(opt_label: Option<ast::Label>) -> Cow<'static, str> {
+    match opt_label {
+        Some(label) => Cow::from(format!("{}: ", label.ident)),
         None => Cow::from(""),
     }
 }

src/expr.rs

@@ -0,0 +1,7 @@
+#![feature(generators)]
+
+unsafe fn foo() {
+    let mut ga = static || { 
+        yield 1;
+    };
+}

tests/source/immovable_generators.rs

@@ -0,0 +1,7 @@
+#![feature(generators)]
+
+unsafe fn foo() {
+    let mut ga = static || {
+        yield 1;
+    };
+}