Merge pull request rust-lang#2515 from sinkuu/nested_shape_lazy_static

Use nested_shape for indenting types of lazy_static

Author: topecongiro

src/macros.rs

@@ -916,7 +916,7 @@ fn format_lazy_static(context: &RewriteContext, shape: Shape, ts: &TokenStream)
             "{}static ref {}: {} =",
             vis,
             id,
-            ty.rewrite(context, shape)?
+            ty.rewrite(context, nested_shape)?
         ));
         result.push_str(&::expr::rewrite_assign_rhs(
             context,

tests/source/lazy_static.rs

@@ -35,3 +35,11 @@ let ptr = :: remacs_sys :: xmalloc (
 remacs_sys :: Lisp_Subr ; :: std :: ptr :: copy_nonoverlapping (
 & subr , ptr , 1 ) ; :: std :: mem :: forget ( subr ) ; :: lisp :: ExternalPtr
 :: new ( ptr ) } } ; }
+
+
+lazy_static! {
+static ref FOO: HashMap<String,
+(&'static str,
+fn(Foo) -> Result<Box<Bar>, Either<FooError, BarError>>
+),> = HashMap::new();
+}

tests/target/lazy_static.rs

@@ -37,3 +37,13 @@ lazy_static! {
         }
     };
 }
+
+lazy_static! {
+    static ref FOO: HashMap<
+        String,
+        (
+            &'static str,
+            fn(Foo) -> Result<Box<Bar>, Either<FooError, BarError>>
+        ),
+    > = HashMap::new();
+}