Properly indent pub fns in extern blocks

Author: marcusklaas

src/expr.rs

@@ -273,7 +273,7 @@ pub fn rewrite_array<'a, I>(expr_iter: I,
     let has_long_item = try_opt!(items.iter()
                                       .map(|li| li.item.as_ref().map(|s| s.len() > 10))
                                       .fold(Some(false),
-                                            |acc, x| acc.and_then(|y| x.map(|x| (x || y)))));
+                                            |acc, x| acc.and_then(|y| x.map(|x| x || y))));
 
     let tactic = if has_long_item || items.iter().any(ListItem::is_multiline) {
         definitive_tactic(&items, ListTactic::HorizontalVertical, max_item_width)

src/items.rs

@@ -143,14 +143,13 @@ impl<'a> FmtVisitor<'a> {
                                                    // These are not actually rust functions,
                                                    // but we format them as such.
                                                    abi::Abi::Rust,
-                                                   ast::Visibility::Inherited,
+                                                   item.vis,
                                                    span,
                                                    false,
                                                    false);
 
                 match rewrite {
                     Some((new_fn, _)) => {
-                        self.buffer.push_str(format_visibility(item.vis));
                         self.buffer.push_str(&new_fn);
                         self.buffer.push_str(";");
                     }

tests/source/extern.rs

@@ -26,3 +26,11 @@ extern "C" {
     fn  foo  (x:  *const c_char ,    ...   ) ->
 libc::c_long;
         }
+
+   extern    {  
+                       pub fn freopen(filename: *const c_char, mode: *const c_char
+                               , mode2: *const c_char
+                               , mode3: *const c_char,
+                               file: *mut FILE)
+                              -> *mut FILE;
+   }

tests/source/mod-1.rs

@@ -15,3 +15,12 @@ mod foo {
 }
 
 mod boxed { pub use std::boxed::{Box, HEAP}; }
+
+mod x {
+        pub fn freopen(filename: *const c_char,
+                   mode: *const c_char,
+                     mode2: *const c_char,
+                   mode3: *const c_char,
+                   file: *mut FILE)
+                   -> *mut FILE{}
+}

tests/target/extern.rs

@@ -36,3 +36,12 @@ extern {
 
     fn foo(x: *const c_char, ...) -> libc::c_long;
 }
+
+extern {
+    pub fn freopen(filename: *const c_char,
+                   mode: *const c_char,
+                   mode2: *const c_char,
+                   mode3: *const c_char,
+                   file: *mut FILE)
+                   -> *mut FILE;
+}

tests/target/mod-1.rs

@@ -24,3 +24,13 @@ mod foo {
 mod boxed {
     pub use std::boxed::{Box, HEAP};
 }
+
+mod x {
+    pub fn freopen(filename: *const c_char,
+                   mode: *const c_char,
+                   mode2: *const c_char,
+                   mode3: *const c_char,
+                   file: *mut FILE)
+                   -> *mut FILE {
+    }
+}