Format the world

1 files changed, 62 insertions, 58 deletions

diff --git a/src/librustc_codegen_utils/link.rs b/src/librustc_codegen_utils/link.rs
index 6b9258c32e7..89a68d775f2 100644
--- a/src/librustc_codegen_utils/link.rs
+++ b/src/librustc_codegen_utils/link.rs
@@ -1,20 +1,23 @@
-use rustc::session::config::{self, OutputFilenames, Input, OutputType};
+use rustc::session::config::{self, Input, OutputFilenames, OutputType};
 use rustc::session::Session;
 use std::path::{Path, PathBuf};
-use syntax::{ast, attr};
 use syntax::symbol::sym;
+use syntax::{ast, attr};
 use syntax_pos::Span;
 
-pub fn out_filename(sess: &Session,
-                crate_type: config::CrateType,
-                outputs: &OutputFilenames,
-                crate_name: &str)
-                -> PathBuf {
+pub fn out_filename(
+    sess: &Session,
+    crate_type: config::CrateType,
+    outputs: &OutputFilenames,
+    crate_name: &str,
+) -> PathBuf {
     let default_filename = filename_for_input(sess, crate_type, crate_name, outputs);
-    let out_filename = outputs.outputs.get(&OutputType::Exe)
-                              .and_then(|s| s.to_owned())
-                              .or_else(|| outputs.single_output_file.clone())
-                              .unwrap_or(default_filename);
+    let out_filename = outputs
+        .outputs
+        .get(&OutputType::Exe)
+        .and_then(|s| s.to_owned())
+        .or_else(|| outputs.single_output_file.clone())
+        .unwrap_or(default_filename);
 
     check_file_is_writeable(&out_filename, sess);
 
@@ -26,21 +29,22 @@ pub fn out_filename(sess: &Session,
 // read-only file.  We should be consistent.
 pub fn check_file_is_writeable(file: &Path, sess: &Session) {
     if !is_writeable(file) {
-        sess.fatal(&format!("output file {} is not writeable -- check its \
-                            permissions", file.display()));
+        sess.fatal(&format!(
+            "output file {} is not writeable -- check its \
+                            permissions",
+            file.display()
+        ));
     }
 }
 
 fn is_writeable(p: &Path) -> bool {
     match p.metadata() {
         Err(..) => true,
-        Ok(m) => !m.permissions().readonly()
+        Ok(m) => !m.permissions().readonly(),
     }
 }
 
-pub fn find_crate_name(sess: Option<&Session>,
-                       attrs: &[ast::Attribute],
-                       input: &Input) -> String {
+pub fn find_crate_name(sess: Option<&Session>, attrs: &[ast::Attribute], input: &Input) -> String {
     let validate = |s: String, span: Option<Span>| {
         rustc_metadata::validate_crate_name(sess, &s, span);
         s
@@ -50,16 +54,18 @@ pub fn find_crate_name(sess: Option<&Session>,
     // as used. After doing this, however, we still prioritize a crate name from
     // the command line over one found in the #[crate_name] attribute. If we
     // find both we ensure that they're the same later on as well.
-    let attr_crate_name = attr::find_by_name(attrs, sym::crate_name)
-        .and_then(|at| at.value_str().map(|s| (at, s)));
+    let attr_crate_name =
+        attr::find_by_name(attrs, sym::crate_name).and_then(|at| at.value_str().map(|s| (at, s)));
 
     if let Some(sess) = sess {
         if let Some(ref s) = sess.opts.crate_name {
             if let Some((attr, name)) = attr_crate_name {
                 if name.as_str() != *s {
-                    let msg = format!("`--crate-name` and `#[crate_name]` are \
+                    let msg = format!(
+                        "`--crate-name` and `#[crate_name]` are \
                                        required to match, but `{}` != `{}`",
-                                      s, name);
+                        s, name
+                    );
                     sess.span_err(attr.span, &msg);
                 }
             }
@@ -73,8 +79,11 @@ pub fn find_crate_name(sess: Option<&Session>,
     if let Input::File(ref path) = *input {
         if let Some(s) = path.file_stem().and_then(|s| s.to_str()) {
             if s.starts_with("-") {
-                let msg = format!("crate names cannot start with a `-`, but \
-                                   `{}` has a leading hyphen", s);
+                let msg = format!(
+                    "crate names cannot start with a `-`, but \
+                                   `{}` has a leading hyphen",
+                    s
+                );
                 if let Some(sess) = sess {
                     sess.err(&msg);
                 }
@@ -87,12 +96,16 @@ pub fn find_crate_name(sess: Option<&Session>,
     "rust_out".to_string()
 }
 
-pub fn filename_for_metadata(sess: &Session,
-                             crate_name: &str,
-                             outputs: &OutputFilenames) -> PathBuf {
+pub fn filename_for_metadata(
+    sess: &Session,
+    crate_name: &str,
+    outputs: &OutputFilenames,
+) -> PathBuf {
     let libname = format!("{}{}", crate_name, sess.opts.cg.extra_filename);
 
-    let out_filename = outputs.single_output_file.clone()
+    let out_filename = outputs
+        .single_output_file
+        .clone()
         .unwrap_or_else(|| outputs.out_directory.join(&format!("lib{}.rmeta", libname)));
 
     check_file_is_writeable(&out_filename, sess);
@@ -100,38 +113,32 @@ pub fn filename_for_metadata(sess: &Session,
     out_filename
 }
 
-pub fn filename_for_input(sess: &Session,
-                          crate_type: config::CrateType,
-                          crate_name: &str,
-                          outputs: &OutputFilenames) -> PathBuf {
+pub fn filename_for_input(
+    sess: &Session,
+    crate_type: config::CrateType,
+    crate_name: &str,
+    outputs: &OutputFilenames,
+) -> PathBuf {
     let libname = format!("{}{}", crate_name, sess.opts.cg.extra_filename);
 
     match crate_type {
-        config::CrateType::Rlib => {
-            outputs.out_directory.join(&format!("lib{}.rlib", libname))
-        }
-        config::CrateType::Cdylib |
-        config::CrateType::ProcMacro |
-        config::CrateType::Dylib => {
-            let (prefix, suffix) = (&sess.target.target.options.dll_prefix,
-                                    &sess.target.target.options.dll_suffix);
-            outputs.out_directory.join(&format!("{}{}{}", prefix, libname,
-                                                suffix))
+        config::CrateType::Rlib => outputs.out_directory.join(&format!("lib{}.rlib", libname)),
+        config::CrateType::Cdylib | config::CrateType::ProcMacro | config::CrateType::Dylib => {
+            let (prefix, suffix) =
+                (&sess.target.target.options.dll_prefix, &sess.target.target.options.dll_suffix);
+            outputs.out_directory.join(&format!("{}{}{}", prefix, libname, suffix))
         }
         config::CrateType::Staticlib => {
-            let (prefix, suffix) = (&sess.target.target.options.staticlib_prefix,
-                                    &sess.target.target.options.staticlib_suffix);
-            outputs.out_directory.join(&format!("{}{}{}", prefix, libname,
-                                                suffix))
+            let (prefix, suffix) = (
+                &sess.target.target.options.staticlib_prefix,
+                &sess.target.target.options.staticlib_suffix,
+            );
+            outputs.out_directory.join(&format!("{}{}{}", prefix, libname, suffix))
         }
         config::CrateType::Executable => {
             let suffix = &sess.target.target.options.exe_suffix;
             let out_filename = outputs.path(OutputType::Exe);
-            if suffix.is_empty() {
-                out_filename
-            } else {
-                out_filename.with_extension(&suffix[1..])
-            }
+            if suffix.is_empty() { out_filename } else { out_filename.with_extension(&suffix[1..]) }
         }
     }
 }
@@ -154,17 +161,14 @@ pub fn default_output_for_target(sess: &Session) -> config::CrateType {
 }
 
 /// Checks if target supports crate_type as output
-pub fn invalid_output_for_target(sess: &Session,
-                                 crate_type: config::CrateType) -> bool {
+pub fn invalid_output_for_target(sess: &Session, crate_type: config::CrateType) -> bool {
     match crate_type {
-        config::CrateType::Cdylib |
-        config::CrateType::Dylib |
-        config::CrateType::ProcMacro => {
+        config::CrateType::Cdylib | config::CrateType::Dylib | config::CrateType::ProcMacro => {
             if !sess.target.target.options.dynamic_linking {
-                return true
+                return true;
             }
             if sess.crt_static() && !sess.target.target.options.crt_static_allows_dylibs {
-                return true
+                return true;
             }
         }
         _ => {}
@@ -177,7 +181,7 @@ pub fn invalid_output_for_target(sess: &Session,
     }
     if !sess.target.target.options.executables {
         if crate_type == config::CrateType::Executable {
-            return true
+            return true;
         }
     }