Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement unique types per fn item, rather than having all fn items have fn pointer type #19891

Merged
merged 13 commits into from
Dec 23, 2014
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/test/compile-fail/fn-item-type.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright 2014 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.

// Test that the types of distinct fn items are not compatible by
// default. See also `run-pass/fn-item-type-*.rs`.

fn foo(x: int) -> int { x * 2 }
fn bar(x: int) -> int { x * 4 }

fn eq<T>(x: T, y: T) { }

fn main() {
let f = if true { foo } else { bar };
//~^ ERROR expected fn item, found a different fn item

eq(foo, bar);
//~^ ERROR expected fn item, found a different fn item
}
28 changes: 28 additions & 0 deletions src/test/run-pass/fn-item-type-cast.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Copyright 2014 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.

// Test explicit coercions from a fn item type to a fn pointer type.

fn foo(x: int) -> int { x * 2 }
fn bar(x: int) -> int { x * 4 }
type IntMap = fn(int) -> int;

fn eq<T>(x: T, y: T) { }

static TEST: Option<IntMap> = Some(foo as IntMap);

fn main() {
let f = foo as IntMap;

let f = if true { foo as IntMap } else { bar as IntMap };
assert_eq!(f(4), 8);

eq(foo as IntMap, bar as IntMap);
}
23 changes: 23 additions & 0 deletions src/test/run-pass/fn-item-type-coerce.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2014 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.

// Test implicit coercions from a fn item type to a fn pointer type.

fn foo(x: int) -> int { x * 2 }
fn bar(x: int) -> int { x * 4 }
type IntMap = fn(int) -> int;

fn eq<T>(x: T, y: T) { }

fn main() {
let f: IntMap = foo;

eq::<IntMap>(foo, bar);
}