Appease tidy and fix save-analysis config for dist builds

diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index ac2e3bc402ac0f1c6264a618b745b9f5e29fcd6b..f6ed4ee91b3c5b66b2ead3cbbdfa5e406f705179 100644 (file)
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -188,7 +188,7 @@ fn main() {
             cmd.arg("-Zsave-analysis");
             cmd.env("RUST_SAVE_ANALYSIS_CONFIG",
                     "{\"output_file\": null,\"full_docs\": false,\"pub_only\": true,\
-                     \"signatures\": false,\"borrow_data\": false}");
+                     \"distro_crate\": true,\"signatures\": false,\"borrow_data\": false}");
         }
 
         // Dealing with rpath here is a little special, so let's go into some

diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs
index 4cfd570adead41a3529762bb7ece34848f5fe969..4740f9a0d5a59662808fc170494908df69e565a2 100644 (file)
--- a/src/librustc_save_analysis/dump_visitor.rs
+++ b/src/librustc_save_analysis/dump_visitor.rs
@@ -561,17 +561,18 @@ fn process_struct(&mut self,
             if let ast::ItemKind::Struct(ast::VariantData::Struct(ref fields, _), _) = item.node
         {
             let include_priv_fields = !self.save_ctxt.config.pub_only;
-            let fields_str = fields.iter()
-                                   .enumerate()
-                                   .filter_map(|(i, f)| {
-                                        if include_priv_fields || f.vis == ast::Visibility::Public {
-                                            f.ident.map(|i| i.to_string()).or_else(|| Some(i.to_string()))
-                                        } else {
-                                            None
-                                        }
-                                   })
-                                   .collect::<Vec<_>>()
-                                   .join(", ");
+            let fields_str = fields
+                .iter()
+                .enumerate()
+                .filter_map(|(i, f)| {
+                     if include_priv_fields || f.vis == ast::Visibility::Public {
+                         f.ident.map(|i| i.to_string()).or_else(|| Some(i.to_string()))
+                     } else {
+                         None
+                     }
+                })
+                .collect::<Vec<_>>()
+                .join(", ");
             let value = format!("{} {{ {} }}", name, fields_str);
             (value, fields.iter().map(|f| ::id_from_node_id(f.id, &self.save_ctxt)).collect())
         } else {