Tidy up

diff --git a/src/librustc_trans/trans/debuginfo/adt.rs b/src/librustc_trans/trans/debuginfo/adt.rs
index 4dc96e0ee6942d431d09a2963cd9c4da973272ca..1145be8002467f30c7f93fea5e1ed5ea149a85e8 100644 (file)
--- a/src/librustc_trans/trans/debuginfo/adt.rs
+++ b/src/librustc_trans/trans/debuginfo/adt.rs
@@ -1,10 +1,10 @@
 // Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://!rust-lang.org/COPYRIGHT.
+// http://rust-lang.org/COPYRIGHT.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
@@ -16,9 +16,8 @@
 
 use super::{UNKNOWN_FILE_METADATA, UNKNOWN_SCOPE_METADATA, UNKNOWN_LINE_NUMBER,
             UniqueTypeId, FLAGS_NONE, create_and_register_recursive_type_forward_declaration};
-
-use super::utils::{debug_context, DIB, span_start, bytes_to_bits, size_and_align_of,
-                   get_namespace_and_span_for_item};
+use super::utils::{debug_context, DIB, span_start, bytes_to_bits,
+                   size_and_align_of, get_namespace_and_span_for_item};
 use super::create::create_DIArray;
 use super::types::compute_debuginfo_type_name;
 use super::metadata::{type_metadata, file_metadata};
@@ -43,6 +42,7 @@
 use syntax::{ast, codemap};
 use syntax::parse::token::{self, special_idents};
 
+
 pub enum MemberOffset {
     FixedMemberOffset { bytes: usize },
     // For ComputedMemberOffset, the offset is read from the llvm type definition.

diff --git a/src/librustc_trans/trans/debuginfo/create.rs b/src/librustc_trans/trans/debuginfo/create.rs
index 33ec225450b6a6c5fb1c9f67cfdcb7732facfd6a..e031cd4efa1fd11a378b8063570154d97a856e6a 100644 (file)
--- a/src/librustc_trans/trans/debuginfo/create.rs
+++ b/src/librustc_trans/trans/debuginfo/create.rs
@@ -1,10 +1,10 @@
 // Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://!rust-lang.org/COPYRIGHT.
+// http://rust-lang.org/COPYRIGHT.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 

diff --git a/src/librustc_trans/trans/debuginfo/doc.rs b/src/librustc_trans/trans/debuginfo/doc.rs
index 138770c42b806b863d0a32ec3d4c852f31648401..a91619b2f845a437732a2d2e8dc3c4b5363d9d6f 100644 (file)
--- a/src/librustc_trans/trans/debuginfo/doc.rs
+++ b/src/librustc_trans/trans/debuginfo/doc.rs
@@ -1,10 +1,10 @@
 // Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://!rust-lang.org/COPYRIGHT.
+// http://rust-lang.org/COPYRIGHT.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 

diff --git a/src/librustc_trans/trans/debuginfo/gdb.rs b/src/librustc_trans/trans/debuginfo/gdb.rs
index 952ae335203bfa6cd150db16a463ef2ed0f5bef8..a6f1199d0ffe7354997e18371da1e768a47626fc 100644 (file)
--- a/src/librustc_trans/trans/debuginfo/gdb.rs
+++ b/src/librustc_trans/trans/debuginfo/gdb.rs
@@ -1,14 +1,14 @@
 // Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://!rust-lang.org/COPYRIGHT.
+// http://rust-lang.org/COPYRIGHT.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// .debug_gdb_scripts binary section
+// .debug_gdb_scripts binary section.
 
 use llvm;
 use llvm::ValueRef;

diff --git a/src/librustc_trans/trans/debuginfo/metadata.rs b/src/librustc_trans/trans/debuginfo/metadata.rs
index d21002ffa95b6109e2ffc50128e8a8bbe7d516cb..81377d429026384a79de598ae9b3391f3c2919b0 100644 (file)
--- a/src/librustc_trans/trans/debuginfo/metadata.rs
+++ b/src/librustc_trans/trans/debuginfo/metadata.rs
@@ -1,15 +1,15 @@
 // Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://!rust-lang.org/COPYRIGHT.
+// http://rust-lang.org/COPYRIGHT.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
 use super::utils::{debug_context, DIB, span_start, bytes_to_bits, size_and_align_of,
-                  get_namespace_and_span_for_item};
+                   get_namespace_and_span_for_item};
 use super::{UNKNOWN_FILE_METADATA, UNKNOWN_SCOPE_METADATA,
             UniqueTypeId, FLAGS_NONE};
 use super::types::compute_debuginfo_type_name;
@@ -35,6 +35,7 @@
 use syntax::codemap::Span;
 use syntax::{ast, codemap};
 
+
 const DW_LANG_RUST: c_uint = 0x9000;
 #[allow(non_upper_case_globals)]
 const DW_ATE_boolean: c_uint = 0x02;

diff --git a/src/librustc_trans/trans/debuginfo/mod.rs b/src/librustc_trans/trans/debuginfo/mod.rs
index 808a6cb01fb9f7c8a45fbd4f2f68d5546e6f0706..0cc4c2a1e6dcdd9065ec7acb25cc24e694c7462c 100644 (file)
--- a/src/librustc_trans/trans/debuginfo/mod.rs
+++ b/src/librustc_trans/trans/debuginfo/mod.rs
@@ -1,24 +1,16 @@
 // Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://!rust-lang.org/COPYRIGHT.
+// http://rust-lang.org/COPYRIGHT.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
 // See doc.rs for documentation.
 mod doc;
 
-pub mod gdb;
-mod utils;
-mod create;
-mod namespace;
-mod types;
-mod metadata;
-mod adt;
-
 use self::VariableAccess::*;
 use self::VariableKind::*;
 use self::InternalDebugLocation::*;
@@ -30,7 +22,8 @@
 use self::create::{declare_local, create_DIArray, is_node_local_to_unit};
 use self::namespace::{namespace_for_item, NamespaceTreeNode};
 use self::types::{compute_debuginfo_type_name, push_debuginfo_type_name};
-use self::metadata::{type_metadata, file_metadata, scope_metadata, compile_unit_metadata, MetadataCreationResult};
+use self::metadata::{type_metadata, file_metadata, scope_metadata,
+                     compile_unit_metadata, MetadataCreationResult};
 use self::adt::{MemberDescriptionFactory, set_members_of_composite_type};
 
 use llvm;
@@ -59,6 +52,15 @@
 use syntax::{ast, codemap, ast_util, ast_map};
 use syntax::parse::token::{self, special_idents};
 
+pub mod gdb;
+mod utils;
+mod create;
+mod namespace;
+mod types;
+mod metadata;
+mod adt;
+
+
 #[allow(non_upper_case_globals)]
 const DW_TAG_auto_variable: c_uint = 0x100;
 #[allow(non_upper_case_globals)]

diff --git a/src/librustc_trans/trans/debuginfo/namespace.rs b/src/librustc_trans/trans/debuginfo/namespace.rs
index 1300a20391834c1fa47f249591e1c9804ba0a8e5..0aa0408c0ef33c31a89fd1566901207dfa7b56cb 100644 (file)
--- a/src/librustc_trans/trans/debuginfo/namespace.rs
+++ b/src/librustc_trans/trans/debuginfo/namespace.rs
@@ -1,14 +1,14 @@
 // Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://!rust-lang.org/COPYRIGHT.
+// http://rust-lang.org/COPYRIGHT.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Namespace Handling
+// Namespace Handling.
 
 use super::utils::{DIB, debug_context};
 

diff --git a/src/librustc_trans/trans/debuginfo/types.rs b/src/librustc_trans/trans/debuginfo/types.rs
index 586dd1526cd24e299609f8c4ccfda800c42a1f80..2d0003d93a5d25a8a63e332fc42418331e8973a8 100644 (file)
--- a/src/librustc_trans/trans/debuginfo/types.rs
+++ b/src/librustc_trans/trans/debuginfo/types.rs
@@ -1,14 +1,14 @@
 // Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://!rust-lang.org/COPYRIGHT.
+// http://rust-lang.org/COPYRIGHT.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Type Names for Debug Info
+// Type Names for Debug Info.
 
 use super::namespace::crate_root_namespace;
 

diff --git a/src/librustc_trans/trans/debuginfo/utils.rs b/src/librustc_trans/trans/debuginfo/utils.rs
index 48c11dd7ebbe06ee92637f425de029127ea72348..6384f90d499a95c720d833a463b24e4ffef79377 100644 (file)
--- a/src/librustc_trans/trans/debuginfo/utils.rs
+++ b/src/librustc_trans/trans/debuginfo/utils.rs
@@ -1,10 +1,10 @@
 // Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
-// http://!rust-lang.org/COPYRIGHT.
+// http://rust-lang.org/COPYRIGHT.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.