diff options
| author | bors <bors@rust-lang.org> | 2015-01-04 04:50:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-04 04:50:56 +0000 |
| commit | 470118f3e915cdc8f936aca0640b28a7a3d8dc6c (patch) | |
| tree | 47f99908d999aa612a4cd44932dcdc3b3a1a966a /src/test | |
| parent | c6c786671d692d7b13c2e5c68a53001327b4b125 (diff) | |
| parent | 351409a62287c7993bc680d9dfcfa13cba9c9c0c (diff) | |
| download | rust-470118f3e915cdc8f936aca0640b28a7a3d8dc6c.tar.gz rust-470118f3e915cdc8f936aca0640b28a7a3d8dc6c.zip | |
auto merge of #20504 : japaric/rust/derive-self, r=alexcrichton
I put the sed scripts in the commits, in case this needs a "rebase".
Diffstat (limited to 'src/test')
6 files changed, 6 insertions, 6 deletions
diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index d92d30ca844..44abd1d09d1 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -18,7 +18,7 @@ extern crate collections; use std::ascii::{AsciiExt, OwnedAsciiExt}; -use std::cmp::Ordering::{mod, Less, Greater, Equal}; +use std::cmp::Ordering::{self, Less, Greater, Equal}; use std::collections::HashMap; use std::sync::mpsc::{channel, Sender, Receiver}; use std::mem::replace; diff --git a/src/test/run-pass/associated-types-binding-in-where-clause.rs b/src/test/run-pass/associated-types-binding-in-where-clause.rs index c3300c52935..e3bd587742c 100644 --- a/src/test/run-pass/associated-types-binding-in-where-clause.rs +++ b/src/test/run-pass/associated-types-binding-in-where-clause.rs @@ -17,7 +17,7 @@ pub trait Foo { fn boo(&self) -> <Self as Foo>::A; } -#[deriving(PartialEq)] +#[derive(PartialEq)] struct Bar; impl Foo for int { diff --git a/src/test/run-pass/associated-types-impl-redirect.rs b/src/test/run-pass/associated-types-impl-redirect.rs index ce7f5dde2ad..eb6a3111cc1 100644 --- a/src/test/run-pass/associated-types-impl-redirect.rs +++ b/src/test/run-pass/associated-types-impl-redirect.rs @@ -20,7 +20,7 @@ #![no_implicit_prelude] use std::kinds::Sized; -use std::option::Option::{None, Some, mod}; +use std::option::Option::{None, Some, self}; trait Iterator { type Item; diff --git a/src/test/run-pass/associated-types-return.rs b/src/test/run-pass/associated-types-return.rs index d8e277510ed..1c2ff466895 100644 --- a/src/test/run-pass/associated-types-return.rs +++ b/src/test/run-pass/associated-types-return.rs @@ -17,7 +17,7 @@ pub trait Foo { fn boo(&self) -> <Self as Foo>::A; } -#[deriving(PartialEq)] +#[derive(PartialEq)] struct Bar; impl Foo for int { diff --git a/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs b/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs index 7afaf290424..8a1a090e919 100644 --- a/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs +++ b/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs @@ -20,7 +20,7 @@ #![no_implicit_prelude] use std::kinds::Sized; -use std::option::Option::{None, Some, mod}; +use std::option::Option::{None, Some, self}; trait Iterator { type Item; diff --git a/src/test/run-pass/use-mod.rs b/src/test/run-pass/use-mod.rs index 3f3cb634d74..cca9c8f2df4 100644 --- a/src/test/run-pass/use-mod.rs +++ b/src/test/run-pass/use-mod.rs @@ -26,7 +26,7 @@ mod foo { } mod baz { - use super::foo::{bar, mod}; + use super::foo::{bar, self}; pub use foo::Third; } |