Skip to content

Commit a131c51

Browse files
irinagpopairinagpopa
committed
Fixed tidy errors.
1 parent 04fa0e7 commit a131c51

File tree

16 files changed

+39
-37
lines changed

16 files changed

+39
-37
lines changed

‎src/librustc/ty/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
12041204
f: F) -> R
12051205
where F: for<'b> FnOnce(TyCtxt<'b, 'tcx, 'tcx>) -> R
12061206
{
1207-
let data_layout = TargetDataLayout::parse(&s.target.target).unwrap_or_else(|err| {
1207+
let data_layout = TargetDataLayout::parse(&s.target.target).unwrap_or_else(|err| {
12081208
s.fatal(&err);
12091209
});
12101210
let interners = CtxtInterners::new(&arenas.interner);

‎src/librustc/ty/layout.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@ impl<'a, 'tcx> ty::maps::TyCtxtAt<'a, 'tcx, 'tcx> {
14401440
}
14411441
}
14421442

1443-
impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
1443+
impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
14441444
where C: LayoutOf<Ty = Ty<'tcx>> + HasTyCtxt<'tcx>,
14451445
C::TyLayout: MaybeResult<TyLayout<'tcx>>
14461446
{

‎src/librustc_target/abi/call/aarch64.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use abi::call::{FnType, ArgType, Reg, RegKind, Uniform};
1212
use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
1313

1414
fn is_homogeneous_aggregate<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
15-
-> Option<Uniform>
15+
-> Option<Uniform>
1616
where Ty: TyLayoutMethods<'a, C> + Copy,
1717
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
1818
{
@@ -41,7 +41,7 @@ fn is_homogeneous_aggregate<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
4141
})
4242
}
4343

44-
fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
44+
fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
4545
where Ty: TyLayoutMethods<'a, C> + Copy,
4646
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
4747
{
@@ -75,7 +75,7 @@ fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
7575
ret.make_indirect();
7676
}
7777

78-
fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
78+
fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
7979
where Ty: TyLayoutMethods<'a, C> + Copy,
8080
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
8181
{
@@ -109,7 +109,7 @@ fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
109109
arg.make_indirect();
110110
}
111111

112-
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
112+
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
113113
where Ty: TyLayoutMethods<'a, C> + Copy,
114114
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
115115
{

‎src/librustc_target/abi/call/arm.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
1313
use spec::HasTargetSpec;
1414

1515
fn is_homogeneous_aggregate<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
16-
-> Option<Uniform>
16+
-> Option<Uniform>
1717
where Ty: TyLayoutMethods<'a, C> + Copy,
1818
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
1919
{
@@ -77,7 +77,7 @@ fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>, vfp: bool)
7777
ret.make_indirect();
7878
}
7979

80-
fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>, vfp: bool)
80+
fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>, vfp: bool)
8181
where Ty: TyLayoutMethods<'a, C> + Copy,
8282
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
8383
{
@@ -101,7 +101,7 @@ fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>, vfp: bool)
101101
});
102102
}
103103

104-
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
104+
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
105105
where Ty: TyLayoutMethods<'a, C> + Copy,
106106
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout + HasTargetSpec
107107
{

‎src/librustc_target/abi/call/asmjs.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
1616
// See the https://github.com/kripken/emscripten-fastcomp-clang repository.
1717
// The class `EmscriptenABIInfo` in `/lib/CodeGen/TargetInfo.cpp` contains the ABI definitions.
1818

19-
fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
19+
fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
2020
where Ty: TyLayoutMethods<'a, C> + Copy,
2121
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
2222
{
@@ -42,7 +42,7 @@ fn classify_arg_ty<Ty>(arg: &mut ArgType<Ty>) {
4242
}
4343
}
4444

45-
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
45+
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
4646
where Ty: TyLayoutMethods<'a, C> + Copy,
4747
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
4848
{

‎src/librustc_target/abi/call/mips.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<Ty>, offset: &mut Size)
4444
*offset = offset.abi_align(align) + size.abi_align(align);
4545
}
4646

47-
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<Ty>)
47+
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<Ty>)
4848
where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> + HasDataLayout
4949
{
5050
let mut offset = Size::from_bytes(0);

‎src/librustc_target/abi/call/mips64.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn extend_integer_width_mips<Ty>(arg: &mut ArgType<Ty>, bits: u64) {
2727
arg.extend_integer_width_to(bits);
2828
}
2929

30-
fn float_reg<'a, Ty, C>(cx: C, ret: &ArgType<'a, Ty>, i: usize) -> Option<Reg>
30+
fn float_reg<'a, Ty, C>(cx: C, ret: &ArgType<'a, Ty>, i: usize) -> Option<Reg>
3131
where Ty: TyLayoutMethods<'a, C> + Copy,
3232
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
3333
{
@@ -41,7 +41,7 @@ fn float_reg<'a, Ty, C>(cx: C, ret: &ArgType<'a, Ty>, i: usize) -> Option<Reg>
4141
}
4242
}
4343

44-
fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
44+
fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
4545
where Ty: TyLayoutMethods<'a, C> + Copy,
4646
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
4747
{
@@ -83,7 +83,7 @@ fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
8383
}
8484
}
8585

86-
fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
86+
fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
8787
where Ty: TyLayoutMethods<'a, C> + Copy,
8888
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
8989
{
@@ -151,7 +151,7 @@ fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
151151
});
152152
}
153153

154-
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
154+
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
155155
where Ty: TyLayoutMethods<'a, C> + Copy,
156156
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
157157
{

‎src/librustc_target/abi/call/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ impl<'a, Ty> TyLayout<'a, Ty> {
245245
}
246246
}
247247

248-
fn homogeneous_aggregate<C>(&self, cx: C) -> Option<Reg>
248+
fn homogeneous_aggregate<C>(&self, cx: C) -> Option<Reg>
249249
where Ty: TyLayoutMethods<'a, C> + Copy, C: LayoutOf<Ty = Ty, TyLayout = Self> + Copy
250250
{
251251
match self.abi {

‎src/librustc_target/abi/call/powerpc64.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ enum ABI {
2222
}
2323
use self::ABI::*;
2424

25-
fn is_homogeneous_aggregate<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>, abi: ABI)
25+
fn is_homogeneous_aggregate<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>, abi: ABI)
2626
-> Option<Uniform>
2727
where Ty: TyLayoutMethods<'a, C> + Copy,
2828
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
29-
{
29+
{
3030
arg.layout.homogeneous_aggregate(cx).and_then(|unit| {
3131
// ELFv1 only passes one-member aggregates transparently.
3232
// ELFv2 passes up to eight uniquely addressable members.

‎src/librustc_target/abi/call/s390x.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use abi::call::{FnType, ArgType, Reg};
1515
use abi::{self, HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
1616

17-
fn classify_ret_ty<'a, Ty, C>(ret: &mut ArgType<Ty>)
17+
fn classify_ret_ty<'a, Ty, C>(ret: &mut ArgType<Ty>)
1818
where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> + HasDataLayout
1919
{
2020
if !ret.layout.is_aggregate() && ret.layout.size.bits() <= 64 {
@@ -46,7 +46,7 @@ fn is_single_fp_element<'a, Ty, C>(cx: C, layout: TyLayout<'a, Ty>) -> bool
4646
}
4747
}
4848

49-
fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
49+
fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
5050
where Ty: TyLayoutMethods<'a, C> + Copy,
5151
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
5252
{
@@ -72,7 +72,7 @@ fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
7272
}
7373
}
7474

75-
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
75+
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
7676
where Ty: TyLayoutMethods<'a, C> + Copy,
7777
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
7878
{

‎src/librustc_target/abi/call/sparc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use abi::call::{ArgType, FnType, Reg, Uniform};
1212
use abi::{HasDataLayout, LayoutOf, Size, TyLayoutMethods};
1313

14-
fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<Ty>, offset: &mut Size)
14+
fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<Ty>, offset: &mut Size)
1515
where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> + HasDataLayout
1616
{
1717
if !ret.layout.is_aggregate() {

‎src/librustc_target/abi/call/sparc64.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
1616
fn is_homogeneous_aggregate<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
1717
-> Option<Uniform>
1818
where Ty: TyLayoutMethods<'a, C> + Copy,
19-
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
19+
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
2020
{
2121
arg.layout.homogeneous_aggregate(cx).and_then(|unit| {
2222
// Ensure we have at most eight uniquely addressable members.
@@ -41,9 +41,9 @@ fn is_homogeneous_aggregate<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
4141
})
4242
}
4343

44-
fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
44+
fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
4545
where Ty: TyLayoutMethods<'a, C> + Copy,
46-
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
46+
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
4747
{
4848
if !ret.layout.is_aggregate() {
4949
ret.extend_integer_width_to(64);
@@ -78,9 +78,9 @@ fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<'a, Ty>)
7878
ret.make_indirect();
7979
}
8080

81-
fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
81+
fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
8282
where Ty: TyLayoutMethods<'a, C> + Copy,
83-
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
83+
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
8484
{
8585
if !arg.layout.is_aggregate() {
8686
arg.extend_integer_width_to(64);
@@ -104,9 +104,9 @@ fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
104104
});
105105
}
106106

107-
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
107+
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
108108
where Ty: TyLayoutMethods<'a, C> + Copy,
109-
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
109+
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
110110
{
111111
if !fty.ret.is_ignore() {
112112
classify_ret_ty(cx, &mut fty.ret);

‎src/librustc_target/abi/call/x86.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn is_single_fp_element<'a, Ty, C>(cx: C, layout: TyLayout<'a, Ty>) -> bool
4040
}
4141
}
4242

43-
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>, flavor: Flavor)
43+
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>, flavor: Flavor)
4444
where Ty: TyLayoutMethods<'a, C> + Copy,
4545
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout + HasTargetSpec
4646
{

‎src/librustc_target/abi/call/x86_64.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ const LARGEST_VECTOR_SIZE: usize = 512;
3232
const MAX_EIGHTBYTES: usize = LARGEST_VECTOR_SIZE / 64;
3333

3434
fn classify_arg<'a, Ty, C>(cx: C, arg: &ArgType<'a, Ty>)
35-
-> Result<[Option<Class>; MAX_EIGHTBYTES], Memory>
35+
-> Result<[Option<Class>; MAX_EIGHTBYTES], Memory>
3636
where Ty: TyLayoutMethods<'a, C> + Copy,
3737
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
3838
{
3939
fn classify<'a, Ty, C>(cx: C, layout: TyLayout<'a, Ty>,
40-
cls: &mut [Option<Class>], off: Size) -> Result<(), Memory>
40+
cls: &mut [Option<Class>], off: Size) -> Result<(), Memory>
4141
where Ty: TyLayoutMethods<'a, C> + Copy,
4242
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
4343
{
@@ -179,7 +179,7 @@ fn cast_target(cls: &[Option<Class>], size: Size) -> CastTarget {
179179
target
180180
}
181181

182-
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
182+
pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
183183
where Ty: TyLayoutMethods<'a, C> + Copy,
184184
C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout
185185
{

‎src/librustc_target/abi/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ impl<'a, Ty> TyLayout<'a, Ty> {
794794
where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> {
795795
Ty::for_variant(self, cx, variant_index)
796796
}
797-
pub fn field<C>(self, cx: C, i: usize) -> C::TyLayout
797+
pub fn field<C>(self, cx: C, i: usize) -> C::TyLayout
798798
where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> {
799799
Ty::field(self, cx, i)
800800
}
@@ -820,4 +820,4 @@ impl<'a, Ty> TyLayout<'a, Ty> {
820820
pub fn size_and_align(&self) -> (Size, Align) {
821821
(self.size, self.align)
822822
}
823-
}
823+
}

‎src/libsyntax/test.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,9 @@ fn mk_main(cx: &mut TestCtxt) -> P<ast::Item> {
563563
let main = ast::ItemKind::Fn(ecx.fn_decl(vec![], ast::FunctionRetTy::Ty(main_ret_ty)),
564564
ast::Unsafety::Normal,
565565
dummy_spanned(ast::Constness::NotConst),
566-
::rustc_target::spec::abi::Abi::Rust, ast::Generics::default(), main_body);
566+
::rustc_target::spec::abi::Abi::Rust,
567+
ast::Generics::default(),
568+
main_body);
567569
P(ast::Item {
568570
ident: Ident::from_str("main"),
569571
attrs: vec![main_attr],

0 commit comments

Comments
 (0)