From 1f667e7995680bc4a49d4675310ac3afc5b93db6 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 7 Jan 2013 22:13:34 -0800 Subject: [PATCH] test: Regular expression mistake. rs=bustage --- src/test/run-pass/cci_capture_clause.rs | 2 +- src/test/run-pass/class-cast-to-trait-cross-crate-2.rs | 2 +- src/test/run-pass/class-separate-impl.rs | 2 +- src/test/run-pass/import-glob-crate.rs | 2 +- src/test/run-pass/issue-2214.rs | 6 +++--- src/test/run-pass/issue-2718.rs | 8 ++++---- src/test/run-pass/issue-3559.rs | 2 +- src/test/run-pass/issue-3656.rs | 2 +- src/test/run-pass/mod-view-items.rs | 2 +- src/test/run-pass/pipe-pingpong-bounded.rs | 8 ++++---- src/test/run-pass/pipe-pingpong-proto.rs | 4 ++-- src/test/run-pass/trait-to-str.rs | 2 +- src/test/run-pass/use.rs | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/test/run-pass/cci_capture_clause.rs b/src/test/run-pass/cci_capture_clause.rs index 4e75d19dba0f..a439d2af8fc0 100644 --- a/src/test/run-pass/cci_capture_clause.rs +++ b/src/test/run-pass/cci_capture_clause.rs @@ -18,7 +18,7 @@ extern mod cci_capture_clause; -use ::core::oldcomm::recv; +use core::oldcomm::recv; fn main() { cci_capture_clause::foo(()).recv() diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs index 7c022dc8441a..5d53453ffc00 100644 --- a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs +++ b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs @@ -11,7 +11,7 @@ // xfail-fast // aux-build:cci_class_cast.rs extern mod cci_class_cast; -use ::core::to_str::ToStr; +use core::to_str::ToStr; use cci_class_cast::kitty::*; fn print_out(thing: T, expected: ~str) { diff --git a/src/test/run-pass/class-separate-impl.rs b/src/test/run-pass/class-separate-impl.rs index 9454dbf9bcb4..eb3728f2c6fc 100644 --- a/src/test/run-pass/class-separate-impl.rs +++ b/src/test/run-pass/class-separate-impl.rs @@ -9,7 +9,7 @@ // except according to those terms. // xfail-fast -use ::core::to_str::*; +use core::to_str::*; struct cat { priv mut meows : uint, diff --git a/src/test/run-pass/import-glob-crate.rs b/src/test/run-pass/import-glob-crate.rs index bde4b96a9274..eba69134c4f0 100644 --- a/src/test/run-pass/import-glob-crate.rs +++ b/src/test/run-pass/import-glob-crate.rs @@ -12,7 +12,7 @@ extern mod std; -use ::core::vec::*; +use core::vec::*; fn main() { let mut v = from_elem(0u, 0); diff --git a/src/test/run-pass/issue-2214.rs b/src/test/run-pass/issue-2214.rs index 7ba9583a77f2..efa6d05f9da7 100644 --- a/src/test/run-pass/issue-2214.rs +++ b/src/test/run-pass/issue-2214.rs @@ -10,9 +10,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use ::core::cast; -use ::core::libc::{c_double, c_int}; -use ::core::f64::*; +use core::cast; +use core::libc::{c_double, c_int}; +use core::f64::*; fn to_c_int(v: &mut int) -> &mut c_int unsafe { cast::reinterpret_cast(&v) diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs index ebc97f79aefd..dc7d5b99d77d 100644 --- a/src/test/run-pass/issue-2718.rs +++ b/src/test/run-pass/issue-2718.rs @@ -12,7 +12,7 @@ // tjc: I don't know why pub mod pipes { - use ::core::cast::{forget, transmute}; + use core::cast::{forget, transmute}; pub enum state { empty, @@ -212,8 +212,8 @@ pub mod pipes { } pub mod pingpong { - use ::core::cast; - use ::core::ptr; + use core::cast; + use core::ptr; pub enum ping = ::pipes::send_packet; pub enum pong = ::pipes::send_packet; @@ -241,7 +241,7 @@ pub mod pingpong { } pub mod client { - use ::core::option; + use core::option; use pingpong; pub type ping = ::pipes::send_packet; diff --git a/src/test/run-pass/issue-3559.rs b/src/test/run-pass/issue-3559.rs index cca4a25569be..da7746681f28 100644 --- a/src/test/run-pass/issue-3559.rs +++ b/src/test/run-pass/issue-3559.rs @@ -13,7 +13,7 @@ // rustc --test map_to_str.rs && ./map_to_str extern mod std; -use ::core::io::{WriterUtil}; +use core::io::{WriterUtil}; use std::map::*; #[cfg(test)] diff --git a/src/test/run-pass/issue-3656.rs b/src/test/run-pass/issue-3656.rs index 0cdc394948db..66c2a4672b4b 100644 --- a/src/test/run-pass/issue-3656.rs +++ b/src/test/run-pass/issue-3656.rs @@ -13,7 +13,7 @@ // Incorrect struct size computation in the FFI, because of not taking // the alignment of elements into account. -use ::core::libc::*; +use core::libc::*; struct KEYGEN { hash_algorithm: [c_uint * 2], diff --git a/src/test/run-pass/mod-view-items.rs b/src/test/run-pass/mod-view-items.rs index 81424a7a8f94..dd5f7484f103 100644 --- a/src/test/run-pass/mod-view-items.rs +++ b/src/test/run-pass/mod-view-items.rs @@ -18,7 +18,7 @@ mod m { #[legacy_exports]; - use ::core::vec; + use core::vec; fn f() -> ~[int] { vec::from_elem(1u, 0) } } diff --git a/src/test/run-pass/pipe-pingpong-bounded.rs b/src/test/run-pass/pipe-pingpong-bounded.rs index a00644fa8db5..803f7f06b512 100644 --- a/src/test/run-pass/pipe-pingpong-bounded.rs +++ b/src/test/run-pass/pipe-pingpong-bounded.rs @@ -18,8 +18,8 @@ // This was generated initially by the pipe compiler, but it's been // modified in hopefully straightforward ways. mod pingpong { - use ::core::pipes::*; - use ::core::ptr; + use core::pipes::*; + use core::ptr; pub type packets = { ping: Packet, @@ -43,7 +43,7 @@ mod pingpong { pub enum ping = server::pong; pub enum pong = client::ping; pub mod client { - use ::core::ptr; + use core::ptr; pub fn ping(+pipe: ping) -> pong { { @@ -61,7 +61,7 @@ mod pingpong { ::pingpong::packets>; } pub mod server { - use ::core::ptr; + use core::ptr; pub type ping = pipes::RecvPacketBuffered<::pingpong::ping, ::pingpong::packets>; diff --git a/src/test/run-pass/pipe-pingpong-proto.rs b/src/test/run-pass/pipe-pingpong-proto.rs index 49eb5c9e63c5..7fb77cba3bde 100644 --- a/src/test/run-pass/pipe-pingpong-proto.rs +++ b/src/test/run-pass/pipe-pingpong-proto.rs @@ -12,7 +12,7 @@ // An example to make sure the protocol parsing syntax extension works. -use ::core::option; +use core::option; proto! pingpong ( ping:send { @@ -25,7 +25,7 @@ proto! pingpong ( ) mod test { - use ::core::pipes::recv; + use core::pipes::recv; use pingpong::{ping, pong}; pub fn client(-chan: ::pingpong::client::ping) { diff --git a/src/test/run-pass/trait-to-str.rs b/src/test/run-pass/trait-to-str.rs index 77384bdd27ae..43cafa49b4e1 100644 --- a/src/test/run-pass/trait-to-str.rs +++ b/src/test/run-pass/trait-to-str.rs @@ -14,7 +14,7 @@ extern mod core; -use ::core::{str, int, vec}; +use core::{str, int, vec}; trait to_str { fn to_str() -> ~str; diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs index 23202243b450..d938c915dc0b 100644 --- a/src/test/run-pass/use.rs +++ b/src/test/run-pass/use.rs @@ -16,7 +16,7 @@ extern mod zed(name = "core"); extern mod bar(name = "core", vers = "0.6"); -use ::core::str; +use core::str; use x = zed::str; mod baz { #[legacy_exports];