-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
75 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
// 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 method calls with self as an argument | ||
|
||
static mut COUNT: u64 = 1; | ||
|
||
struct Foo; | ||
|
||
trait Bar { | ||
fn foo1(&self); | ||
fn foo2(self); | ||
fn foo3(self: Box<Self>); | ||
|
||
fn bar1(&self) { | ||
unsafe { COUNT *= 7; } | ||
} | ||
fn bar2(self) { | ||
unsafe { COUNT *= 11; } | ||
} | ||
fn bar3(self: Box<Self>) { | ||
unsafe { COUNT *= 13; } | ||
} | ||
} | ||
|
||
impl Bar for Foo { | ||
fn foo1(&self) { | ||
unsafe { COUNT *= 2; } | ||
} | ||
|
||
fn foo2(self) { | ||
unsafe { COUNT *= 3; } | ||
} | ||
|
||
fn foo3(self: Box<Foo>) { | ||
unsafe { COUNT *= 5; } | ||
} | ||
} | ||
|
||
impl Foo { | ||
fn baz(self) { | ||
unsafe { COUNT *= 17; } | ||
// Test internal call. | ||
Bar::foo1(&self); | ||
Bar::foo2(self); | ||
Bar::foo3(box self); | ||
|
||
Bar::bar1(&self); | ||
Bar::bar2(self); | ||
Bar::bar3(box self); | ||
} | ||
} | ||
|
||
fn main() { | ||
let x = Foo; | ||
// Test external call. | ||
Bar::foo1(&x); | ||
Bar::foo2(x); | ||
Bar::foo3(box x); | ||
|
||
Bar::bar1(&x); | ||
Bar::bar2(x); | ||
Bar::bar3(box x); | ||
|
||
x.baz(); | ||
|
||
unsafe { assert!(COUNT == 2u64*2*3*3*5*5*7*7*11*11*13*13*17); } | ||
} |
fe8e591
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from pcwalton
at nrc@fe8e591
fe8e591
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging nick29581/rust/ufcs1 = fe8e591 into auto
fe8e591
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nick29581/rust/ufcs1 = fe8e591 merged ok, testing candidate = 71dfa5b
fe8e591
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1792
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1789
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1783
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1789
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1786
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1785
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1785
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1789
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1783
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1782
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1785
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1441
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1440
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1442
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/279
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/280
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/272
fe8e591
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 71dfa5b