Skip to content

Commit

Permalink
rust-lang#10381: Warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
tamird committed Apr 24, 2015
1 parent f4dd361 commit 5ded8a8
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 52 deletions.
2 changes: 2 additions & 0 deletions src/test/auxiliary/cross_crate_spans.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
// except according to those terms.

#![crate_type = "rlib"]

#![allow(unused_variables)]
#![omit_gdb_pretty_printer_section]

// no-prefer-dynamic
Expand Down
3 changes: 1 addition & 2 deletions src/test/debuginfo/constant-debug-locs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@

// compile-flags:-g

#![allow(unused_variables)]
#![allow(dead_code)]
#![allow(dead_code, unused_variables)]
#![omit_gdb_pretty_printer_section]
#![feature(std_misc, core)]

Expand Down
3 changes: 1 addition & 2 deletions src/test/debuginfo/constant-in-match-pattern.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@

// compile-flags:-g

#![allow(unused_variables)]
#![allow(dead_code)]
#![allow(dead_code, unused_variables)]
#![omit_gdb_pretty_printer_section]

// This test makes sure that the compiler doesn't crash when trying to assign
Expand Down
4 changes: 2 additions & 2 deletions src/test/debuginfo/cross-crate-spans.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ extern crate cross_crate_spans;

// === GDB TESTS ===================================================================================

// gdb-command:break cross_crate_spans.rs:21
// gdb-command:break cross_crate_spans.rs:23
// gdb-command:run

// gdb-command:print result
Expand All @@ -44,7 +44,7 @@ extern crate cross_crate_spans;

// === LLDB TESTS ==================================================================================

// lldb-command:b cross_crate_spans.rs:21
// lldb-command:b cross_crate_spans.rs:23
// lldb-command:run

// lldb-command:print result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
// lldb-check:[...]$31 = 45
// lldb-command:continue

#![allow(unused_variables)]
#![allow(dead_code, unused_assignments, unused_variables)]
#![omit_gdb_pretty_printer_section]

#[no_stack_check]
Expand Down
2 changes: 2 additions & 0 deletions src/test/debuginfo/gdb-pretty-std.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
// gdb-command: print none
// gdb-check:$6 = None

#![allow(unused_variables)]

fn main() {

// &[]
Expand Down
2 changes: 2 additions & 0 deletions src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
// gdb-command: print c_style_enum3
// gdb-check:$5 = CStyleEnumVar3

#![allow(dead_code, unused_variables)]

struct RegularStruct {
the_first_field: isize,
the_second_field: f64,
Expand Down
2 changes: 2 additions & 0 deletions src/test/debuginfo/gdb-pretty-struct-and-enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
// gdb-command: print none_check2
// gdb-check:$18 = None

#![allow(dead_code, unused_variables)]

use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3};
use self::MixedEnum::{MixedEnumCStyleVar, MixedEnumTupleVar, MixedEnumStructVar};
use self::NestedEnum::{NestedVariant1, NestedVariant2};
Expand Down
90 changes: 46 additions & 44 deletions src/test/debuginfo/type-names.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// gdb-check:type = struct Struct1

// gdb-command:whatis generic_struct1
// gdb-check:type = struct GenericStruct<type_names::Mod1::Struct2, type_names::Mod1::Mod2::Struct3>
// gdb-check:type = struct GenericStruct<type_names::mod1::Struct2, type_names::mod1::mod2::Struct3>

// gdb-command:whatis generic_struct2
// gdb-check:type = struct GenericStruct<type_names::Struct1, extern "fastcall" fn(isize) -> usize>
Expand All @@ -41,26 +41,26 @@
// gdb-check:type = union Enum2

// gdb-command:whatis generic_enum_1
// gdb-check:type = union Enum3<type_names::Mod1::Struct2>
// gdb-check:type = union Enum3<type_names::mod1::Struct2>

// gdb-command:whatis generic_enum_2
// gdb-check:type = union Enum3<type_names::Struct1>


// TUPLES
// gdb-command:whatis tuple1
// gdb-check:type = struct (u32, type_names::Struct1, type_names::Mod1::Mod2::Enum3<type_names::Mod1::Struct2>)
// gdb-check:type = struct (u32, type_names::Struct1, type_names::mod1::mod2::Enum3<type_names::mod1::Struct2>)

// gdb-command:whatis tuple2
// gdb-check:type = struct ((type_names::Struct1, type_names::Mod1::Mod2::Struct3), type_names::Mod1::Enum2, char)
// gdb-check:type = struct ((type_names::Struct1, type_names::mod1::mod2::Struct3), type_names::mod1::Enum2, char)


// BOX
// gdb-command:whatis box1
// gdb-check:type = struct (Box<f32>, i32)

// gdb-command:whatis box2
// gdb-check:type = struct (Box<type_names::Mod1::Mod2::Enum3<f32>>, i32)
// gdb-check:type = struct (Box<type_names::mod1::mod2::Enum3<f32>>, i32)


// REFERENCES
Expand All @@ -74,7 +74,7 @@
// gdb-check:type = struct (&mut type_names::Struct1, i32)

// gdb-command:whatis mut_ref2
// gdb-check:type = struct (&mut type_names::GenericStruct<type_names::Mod1::Enum2, f64>, i32)
// gdb-check:type = struct (&mut type_names::GenericStruct<type_names::mod1::Enum2, f64>, i32)


// RAW POINTERS
Expand All @@ -85,7 +85,7 @@
// gdb-check:type = struct (*mut isize, isize)

// gdb-command:whatis mut_ptr3
// gdb-check:type = struct (*mut type_names::Mod1::Mod2::Enum3<type_names::Struct1>, isize)
// gdb-check:type = struct (*mut type_names::mod1::mod2::Enum3<type_names::Struct1>, isize)

// gdb-command:whatis const_ptr1
// gdb-check:type = struct (*const type_names::Struct1, isize)
Expand All @@ -94,7 +94,7 @@
// gdb-check:type = struct (*const isize, isize)

// gdb-command:whatis const_ptr3
// gdb-check:type = struct (*const type_names::Mod1::Mod2::Enum3<type_names::Struct1>, isize)
// gdb-check:type = struct (*const type_names::mod1::mod2::Enum3<type_names::Struct1>, isize)


// VECTORS
Expand All @@ -108,7 +108,7 @@
// gdb-check:type = struct &[usize]

// gdb-command:whatis slice2
// gdb-check:type = struct &[type_names::Mod1::Enum2]
// gdb-check:type = struct &[type_names::mod1::Enum2]


// TRAITS
Expand All @@ -122,18 +122,18 @@
// gdb-check:type = struct &mut Trait1

// gdb-command:whatis generic_box_trait
// gdb-check:type = struct Box<Trait2<i32, type_names::Mod1::Struct2>>
// gdb-check:type = struct Box<Trait2<i32, type_names::mod1::Struct2>>

// gdb-command:whatis generic_ref_trait
// gdb-check:type = struct &Trait2<type_names::Struct1, type_names::Struct1>

// gdb-command:whatis generic_mut_ref_trait
// gdb-check:type = struct &mut Trait2<type_names::Mod1::Mod2::Struct3, type_names::GenericStruct<usize, isize>>
// gdb-check:type = struct &mut Trait2<type_names::mod1::mod2::Struct3, type_names::GenericStruct<usize, isize>>


// BARE FUNCTIONS
// gdb-command:whatis rust_fn
// gdb-check:type = struct (fn(core::option::Option<isize>, core::option::Option<&type_names::Mod1::Struct2>), usize)
// gdb-check:type = struct (fn(core::option::Option<isize>, core::option::Option<&type_names::mod1::Struct2>), usize)

// gdb-command:whatis extern_c_fn
// gdb-check:type = struct (extern "C" fn(isize), usize)
Expand All @@ -151,7 +151,7 @@
// gdb-check:type = struct (extern "C" fn() -> type_names::Struct1, usize)

// gdb-command:whatis unsafe_fn_with_return_value
// gdb-check:type = struct (unsafe fn(type_names::GenericStruct<u16, u8>) -> type_names::Mod1::Struct2, usize)
// gdb-check:type = struct (unsafe fn(type_names::GenericStruct<u16, u8>) -> type_names::mod1::Struct2, usize)

// gdb-command:whatis extern_stdcall_fn_with_return_value
// gdb-check:type = struct (extern "stdcall" fn(Box<isize>) -> usize, usize)
Expand All @@ -160,7 +160,7 @@
// gdb-check:type = struct (fn(isize) -> isize, usize)

// gdb-command:whatis generic_function_struct3
// gdb-check:type = struct (fn(type_names::Mod1::Mod2::Struct3) -> type_names::Mod1::Mod2::Struct3, usize)
// gdb-check:type = struct (fn(type_names::mod1::mod2::Struct3) -> type_names::mod1::mod2::Struct3, usize)

// gdb-command:whatis variadic_function
// gdb-check:type = struct (unsafe extern "C" fn(*const u8, ...) -> isize, usize)
Expand All @@ -174,36 +174,37 @@
// gdb-check:type = struct (closure, usize)

#![feature(box_syntax)]
#![allow(unused_variables)]
#![omit_gdb_pretty_printer_section]

use self::Enum1::{Variant1_1, Variant1_2};
use self::Enum1::{Variant1, Variant2};
use std::marker::PhantomData;
use std::ptr;

struct Struct1;
struct GenericStruct<T1, T2>(PhantomData<(T1,T2)>);

enum Enum1 {
Variant1_1,
Variant1_2(isize)
Variant1,
Variant2(isize),
}

mod Mod1 {
pub use self::Enum2::{Variant2_1, Variant2_2};
mod mod1 {
pub use self::Enum2::{Variant1, Variant2};
pub struct Struct2;

pub enum Enum2 {
Variant2_1,
Variant2_2(super::Struct1)
Variant1,
Variant2(super::Struct1),
}

pub mod Mod2 {
pub use self::Enum3::{Variant3_1, Variant3_2};
pub mod mod2 {
pub use self::Enum3::{Variant1, Variant2};
pub struct Struct3;

pub enum Enum3<T> {
Variant3_1,
Variant3_2(T),
Variant1,
Variant2(T),
}
}
}
Expand All @@ -214,18 +215,19 @@ trait Trait2<T1, T2> { fn dummy(&self, _: T1, _:T2) { } }
impl Trait1 for isize {}
impl<T1, T2> Trait2<T1, T2> for isize {}

fn rust_fn(_: Option<isize>, _: Option<&Mod1::Struct2>) {}
fn rust_fn(_: Option<isize>, _: Option<&mod1::Struct2>) {}
extern "C" fn extern_c_fn(_: isize) {}
unsafe fn unsafe_fn(_: Result<char, f64>) {}
extern "stdcall" fn extern_stdcall_fn() {}

fn rust_fn_with_return_value(_: f64) -> usize { 4 }
extern "C" fn extern_c_fn_with_return_value() -> Struct1 { Struct1 }
unsafe fn unsafe_fn_with_return_value(_: GenericStruct<u16, u8>) -> Mod1::Struct2 { Mod1::Struct2 }
unsafe fn unsafe_fn_with_return_value(_: GenericStruct<u16, u8>) -> mod1::Struct2 { mod1::Struct2 }
extern "stdcall" fn extern_stdcall_fn_with_return_value(_: Box<isize>) -> usize { 0 }

fn generic_function<T>(x: T) -> T { x }

#[allow(improper_ctypes)]
extern {
fn printf(_:*const u8, ...) -> isize;
}
Expand All @@ -241,53 +243,53 @@ fn main() {

// Structs
let simple_struct = Struct1;
let generic_struct1: GenericStruct<Mod1::Struct2, Mod1::Mod2::Struct3> =
let generic_struct1: GenericStruct<mod1::Struct2, mod1::mod2::Struct3> =
GenericStruct(PhantomData);
let generic_struct2: GenericStruct<Struct1, extern "fastcall" fn(isize) -> usize> =
GenericStruct(PhantomData);
let mod_struct = Mod1::Struct2;
let mod_struct = mod1::Struct2;

// Enums
let simple_enum_1 = Variant1_1;
let simple_enum_2 = Variant1_2(0);
let simple_enum_3 = Mod1::Variant2_2(Struct1);
let simple_enum_1 = Variant1;
let simple_enum_2 = Variant2(0);
let simple_enum_3 = mod1::Variant2(Struct1);

let generic_enum_1: Mod1::Mod2::Enum3<Mod1::Struct2> = Mod1::Mod2::Variant3_1;
let generic_enum_2 = Mod1::Mod2::Variant3_2(Struct1);
let generic_enum_1: mod1::mod2::Enum3<mod1::Struct2> = mod1::mod2::Variant1;
let generic_enum_2 = mod1::mod2::Variant2(Struct1);

// Tuples
let tuple1 = (8u32, Struct1, Mod1::Mod2::Variant3_2(Mod1::Struct2));
let tuple2 = ((Struct1, Mod1::Mod2::Struct3), Mod1::Variant2_1, 'x');
let tuple1 = (8u32, Struct1, mod1::mod2::Variant2(mod1::Struct2));
let tuple2 = ((Struct1, mod1::mod2::Struct3), mod1::Variant1, 'x');

// Box
let box1 = (box 1f32, 0i32);
let box2 = (box Mod1::Mod2::Variant3_2(1f32), 0i32);
let box2 = (box mod1::mod2::Variant2(1f32), 0i32);

// References
let ref1 = (&Struct1, 0i32);
let ref2 = (&GenericStruct::<char, Struct1>(PhantomData), 0i32);

let mut mut_struct1 = Struct1;
let mut mut_generic_struct = GenericStruct::<Mod1::Enum2, f64>(PhantomData);
let mut mut_generic_struct = GenericStruct::<mod1::Enum2, f64>(PhantomData);
let mut_ref1 = (&mut mut_struct1, 0i32);
let mut_ref2 = (&mut mut_generic_struct, 0i32);

// Raw Pointers
let mut_ptr1: (*mut Struct1, isize) = (ptr::null_mut(), 0);
let mut_ptr2: (*mut isize, isize) = (ptr::null_mut(), 0);
let mut_ptr3: (*mut Mod1::Mod2::Enum3<Struct1>, isize) = (ptr::null_mut(), 0);
let mut_ptr3: (*mut mod1::mod2::Enum3<Struct1>, isize) = (ptr::null_mut(), 0);

let const_ptr1: (*const Struct1, isize) = (ptr::null(), 0);
let const_ptr2: (*const isize, isize) = (ptr::null(), 0);
let const_ptr3: (*const Mod1::Mod2::Enum3<Struct1>, isize) = (ptr::null(), 0);
let const_ptr3: (*const mod1::mod2::Enum3<Struct1>, isize) = (ptr::null(), 0);

// Vectors
let fixed_size_vec1 = ([Struct1, Struct1, Struct1], 0i16);
let fixed_size_vec2 = ([0_usize, 1, 2], 0i16);

let vec1 = vec![0_usize, 2, 3];
let slice1 = &*vec1;
let vec2 = vec![Mod1::Variant2_2(Struct1)];
let vec2 = vec![mod1::Variant2(Struct1)];
let slice2 = &*vec2;

// Trait Objects
Expand All @@ -296,12 +298,12 @@ fn main() {
let mut mut_int1 = 0_isize;
let mut_ref_trait = (&mut mut_int1) as &mut Trait1;

let generic_box_trait = (box 0_isize) as Box<Trait2<i32, Mod1::Struct2>>;
let generic_box_trait = (box 0_isize) as Box<Trait2<i32, mod1::Struct2>>;
let generic_ref_trait = (&0_isize) as &Trait2<Struct1, Struct1>;

let mut generic_mut_ref_trait_impl = 0_isize;
let generic_mut_ref_trait = (&mut generic_mut_ref_trait_impl) as
&mut Trait2<Mod1::Mod2::Struct3, GenericStruct<usize, isize>>;
&mut Trait2<mod1::mod2::Struct3, GenericStruct<usize, isize>>;

// Bare Functions
let rust_fn = (rust_fn, 0_usize);
Expand All @@ -315,7 +317,7 @@ fn main() {
let extern_stdcall_fn_with_return_value = (extern_stdcall_fn_with_return_value, 0_usize);

let generic_function_int = (generic_function::<isize>, 0_usize);
let generic_function_struct3 = (generic_function::<Mod1::Mod2::Struct3>, 0_usize);
let generic_function_struct3 = (generic_function::<mod1::mod2::Struct3>, 0_usize);

let variadic_function = (printf, 0_usize);

Expand Down
2 changes: 1 addition & 1 deletion src/test/debuginfo/vec-slices.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
// lldb-command:print padded_struct
// lldb-check:[...]$5 = &[AStruct { x: 10, y: 11, z: 12 }, AStruct { x: 13, y: 14, z: 15 }]

#![allow(unused_variables)]
#![allow(dead_code, unused_variables)]
#![omit_gdb_pretty_printer_section]

struct AStruct {
Expand Down

0 comments on commit 5ded8a8

Please sign in to comment.