Skip to content

Commit ac19d2f

Browse files
nrcnrc
committed
Tidy up
1 parent 3c614e3 commit ac19d2f

File tree

9 files changed

+46
-43
lines changed

9 files changed

+46
-43
lines changed

‎src/librustc_trans/trans/debuginfo/adt.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
3-
// http://!rust-lang.org/COPYRIGHT.
3+
// http://rust-lang.org/COPYRIGHT.
44
//
55
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

@@ -16,9 +16,8 @@ use self::MemberOffset::*;
1616

1717
use super::{UNKNOWN_FILE_METADATA, UNKNOWN_SCOPE_METADATA, UNKNOWN_LINE_NUMBER,
1818
UniqueTypeId, FLAGS_NONE, create_and_register_recursive_type_forward_declaration};
19-
20-
use super::utils::{debug_context, DIB, span_start, bytes_to_bits, size_and_align_of,
21-
get_namespace_and_span_for_item};
19+
use super::utils::{debug_context, DIB, span_start, bytes_to_bits,
20+
size_and_align_of, get_namespace_and_span_for_item};
2221
use super::create::create_DIArray;
2322
use super::types::compute_debuginfo_type_name;
2423
use super::metadata::{type_metadata, file_metadata};
@@ -43,6 +42,7 @@ use syntax::codemap::Span;
4342
use syntax::{ast, codemap};
4443
use syntax::parse::token::{self, special_idents};
4544

45+
4646
pub enum MemberOffset {
4747
FixedMemberOffset { bytes: usize },
4848
// For ComputedMemberOffset, the offset is read from the llvm type definition.

‎src/librustc_trans/trans/debuginfo/create.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
3-
// http://!rust-lang.org/COPYRIGHT.
3+
// http://rust-lang.org/COPYRIGHT.
44
//
55
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

‎src/librustc_trans/trans/debuginfo/doc.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
3-
// http://!rust-lang.org/COPYRIGHT.
3+
// http://rust-lang.org/COPYRIGHT.
44
//
55
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

‎src/librustc_trans/trans/debuginfo/gdb.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
3-
// http://!rust-lang.org/COPYRIGHT.
3+
// http://rust-lang.org/COPYRIGHT.
44
//
55
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// .debug_gdb_scripts binary section
11+
// .debug_gdb_scripts binary section.
1212

1313
use llvm;
1414
use llvm::ValueRef;

‎src/librustc_trans/trans/debuginfo/metadata.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
3-
// http://!rust-lang.org/COPYRIGHT.
3+
// http://rust-lang.org/COPYRIGHT.
44
//
55
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

1111
use super::utils::{debug_context, DIB, span_start, bytes_to_bits, size_and_align_of,
12-
get_namespace_and_span_for_item};
12+
get_namespace_and_span_for_item};
1313
use super::{UNKNOWN_FILE_METADATA, UNKNOWN_SCOPE_METADATA,
1414
UniqueTypeId, FLAGS_NONE};
1515
use super::types::compute_debuginfo_type_name;
@@ -35,6 +35,7 @@ use std::ptr;
3535
use syntax::codemap::Span;
3636
use syntax::{ast, codemap};
3737

38+
3839
const DW_LANG_RUST: c_uint = 0x9000;
3940
#[allow(non_upper_case_globals)]
4041
const DW_ATE_boolean: c_uint = 0x02;

‎src/librustc_trans/trans/debuginfo/mod.rs

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
3-
// http://!rust-lang.org/COPYRIGHT.
3+
// http://rust-lang.org/COPYRIGHT.
44
//
55
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

1111
// See doc.rs for documentation.
1212
mod doc;
1313

14-
pub mod gdb;
15-
mod utils;
16-
mod create;
17-
mod namespace;
18-
mod types;
19-
mod metadata;
20-
mod adt;
21-
2214
use self::VariableAccess::*;
2315
use self::VariableKind::*;
2416
use self::InternalDebugLocation::*;
@@ -30,7 +22,8 @@ use self::utils::{debug_context, DIB, span_start,
3022
use self::create::{declare_local, create_DIArray, is_node_local_to_unit};
3123
use self::namespace::{namespace_for_item, NamespaceTreeNode};
3224
use self::types::{compute_debuginfo_type_name, push_debuginfo_type_name};
33-
use self::metadata::{type_metadata, file_metadata, scope_metadata, compile_unit_metadata, MetadataCreationResult};
25+
use self::metadata::{type_metadata, file_metadata, scope_metadata,
26+
compile_unit_metadata, MetadataCreationResult};
3427
use self::adt::{MemberDescriptionFactory, set_members_of_composite_type};
3528

3629
use llvm;
@@ -59,6 +52,15 @@ use syntax::codemap::{Span, Pos};
5952
use syntax::{ast, codemap, ast_util, ast_map};
6053
use syntax::parse::token::{self, special_idents};
6154

55+
pub mod gdb;
56+
mod utils;
57+
mod create;
58+
mod namespace;
59+
mod types;
60+
mod metadata;
61+
mod adt;
62+
63+
6264
#[allow(non_upper_case_globals)]
6365
const DW_TAG_auto_variable: c_uint = 0x100;
6466
#[allow(non_upper_case_globals)]

‎src/librustc_trans/trans/debuginfo/namespace.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
3-
// http://!rust-lang.org/COPYRIGHT.
3+
// http://rust-lang.org/COPYRIGHT.
44
//
55
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// Namespace Handling
11+
// Namespace Handling.
1212

1313
use super::utils::{DIB, debug_context};
1414

‎src/librustc_trans/trans/debuginfo/types.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
3-
// http://!rust-lang.org/COPYRIGHT.
3+
// http://rust-lang.org/COPYRIGHT.
44
//
55
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// Type Names for Debug Info
11+
// Type Names for Debug Info.
1212

1313
use super::namespace::crate_root_namespace;
1414

‎src/librustc_trans/trans/debuginfo/utils.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
3-
// http://!rust-lang.org/COPYRIGHT.
3+
// http://rust-lang.org/COPYRIGHT.
44
//
55
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://!www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://!opensource.org/licenses/MIT>, at your
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

0 commit comments

Comments
 (0)