Skip to content

Commit

Permalink
Auto merge of #25161 - jooert:moretests, r=alexcrichton
Browse files Browse the repository at this point in the history
The last one (at least for the moment 😃).

r? @alexcrichton
  • Loading branch information
bors committed May 7, 2015
2 parents acb3aa0 + 1a8ccd7 commit 05d5fca
Show file tree
Hide file tree
Showing 8 changed files with 177 additions and 0 deletions.
19 changes: 19 additions & 0 deletions src/test/compile-fail/issue-21177.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// 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.
//
// 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
// option. This file may not be copied, modified, or distributed
// except according to those terms.

trait Trait {
type A;
type B;
}

fn foo<T: Trait<A = T::B>>() { }
//~^ ERROR: unsupported cyclic reference between types/traits detected

fn main() { }
25 changes: 25 additions & 0 deletions src/test/compile-fail/issue-21701.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// 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.
//
// 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
// option. This file may not be copied, modified, or distributed
// except according to those terms.

fn foo<U>(t: U) {
let y = t();
//~^ ERROR: expected function, found `U`
}

struct Bar;

pub fn some_func() {
let f = Bar();
//~^ ERROR: expected function, found `Bar`
}

fn main() {
foo(|| { 1 });
}
27 changes: 27 additions & 0 deletions src/test/compile-fail/issue-22037.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// 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.
//
// 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
// option. This file may not be copied, modified, or distributed
// except according to those terms.

trait A {
type Output;
fn a(&self) -> <Self as A>::X;
//~^ ERROR: use of undeclared associated type `A::X`
}

impl A for u32 {
type Output = u32;
fn a(&self) -> u32 {
0
}
}

fn main() {
let a: u32 = 0;
let b: u32 = a.a();
}
8 changes: 8 additions & 0 deletions src/test/run-make/issue-20626/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-include ../tools.mk

# Test output to be four
# The original error only occurred when printing, not when comparing using assert!

all:
$(RUSTC) foo.rs -O
[ `$(call RUN,foo)` = "4" ]
23 changes: 23 additions & 0 deletions src/test/run-make/issue-20626/foo.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// 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.
//
// 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
// option. This file may not be copied, modified, or distributed
// except according to those terms.

fn identity(a: &u32) -> &u32 { a }

fn print_foo(f: &fn(&u32) -> &u32, x: &u32) {
print!("{}", (*f)(x));
}

fn main() {
let x = &4;
let f: fn(&u32) -> &u32 = identity;

// Didn't print 4 on optimized builds
print_foo(&f, x);
}
27 changes: 27 additions & 0 deletions src/test/run-pass/issue-21562.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// 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.
//
// 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
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(core)]

extern crate core;
use core::marker::Sync;

static SARRAY: [i32; 1] = [11];

struct MyStruct {
pub arr: *const [i32],
}
unsafe impl Sync for MyStruct {}

static mystruct: MyStruct = MyStruct {
arr: &SARRAY
};

fn main() {}
19 changes: 19 additions & 0 deletions src/test/run-pass/issue-22258.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// 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.
//
// 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
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use std::ops::Add;

fn f<T: Add>(a: T, b: T) -> <T as Add>::Output {
a + b
}

fn main() {
println!("a + b is {}", f::<f32>(100f32, 200f32));
}
29 changes: 29 additions & 0 deletions src/test/run-pass/issue-22463.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// 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.
//
// 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
// option. This file may not be copied, modified, or distributed
// except according to those terms.

macro_rules! items {
() => {
type A = ();
fn a() {}
}
}

trait Foo {
type A;
fn a();
}

impl Foo for () {
items!();
}

fn main() {

}

0 comments on commit 05d5fca

Please sign in to comment.