From 2d690ae43f77a6c4e1f8ba10afd32926e2459e8e Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Tue, 4 Sep 2012 11:23:53 -0700 Subject: [PATCH] libstd: "import" -> "use" --- src/libstd/arc.rs | 5 ++--- src/libstd/arena.rs | 9 ++++----- src/libstd/base64.rs | 2 +- src/libstd/bitv.rs | 2 +- src/libstd/comm.rs | 2 +- src/libstd/dbg.rs | 2 +- src/libstd/deque.rs | 4 ++-- src/libstd/ebml.rs | 4 ++-- src/libstd/fun_treemap.rs | 6 +++--- src/libstd/getopts.rs | 8 ++++---- src/libstd/json.rs | 13 +++++-------- src/libstd/list.rs | 8 ++++---- src/libstd/map.rs | 14 +++++++------- src/libstd/net.rs | 6 +++--- src/libstd/net_ip.rs | 36 +++++++++++++++++------------------- src/libstd/net_tcp.rs | 16 ++++++++-------- src/libstd/net_url.rs | 15 +++++++-------- src/libstd/par.rs | 2 +- src/libstd/prettyprint.rs | 6 +++--- src/libstd/smallintmap.rs | 8 ++++---- src/libstd/sort.rs | 4 ++-- src/libstd/sync.rs | 2 +- src/libstd/tempfile.rs | 5 ++--- src/libstd/term.rs | 2 +- src/libstd/test.rs | 14 +++++++------- src/libstd/time.rs | 8 ++++---- src/libstd/timer.rs | 8 ++++---- src/libstd/treemap.rs | 6 +++--- src/libstd/uv.rs | 6 +++--- src/libstd/uv_global_loop.rs | 18 +++++++++--------- src/libstd/uv_iotask.rs | 12 ++++++------ src/libstd/uv_ll.rs | 6 +++--- 32 files changed, 125 insertions(+), 134 deletions(-) diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs index 89cdb2a674d..ce037dfec98 100644 --- a/src/libstd/arc.rs +++ b/src/libstd/arc.rs @@ -6,11 +6,10 @@ * between tasks. */ -import unsafe::{SharedMutableState, shared_mutable_state, +use unsafe::{SharedMutableState, shared_mutable_state, clone_shared_mutable_state, unwrap_shared_mutable_state, get_shared_mutable_state, get_shared_immutable_state}; -import sync; -import sync::{Mutex, mutex_with_condvars, +use sync::{Mutex, mutex_with_condvars, RWlock, rwlock_with_condvars}; export ARC, clone, get; diff --git a/src/libstd/arena.rs b/src/libstd/arena.rs index 4e20195e1f9..7037752cc26 100644 --- a/src/libstd/arena.rs +++ b/src/libstd/arena.rs @@ -24,11 +24,10 @@ export Arena, arena_with_size; -import list; -import list::{list, cons, nil}; -import unsafe::reinterpret_cast; -import sys::TypeDesc; -import libc::size_t; +use list::{list, cons, nil}; +use unsafe::reinterpret_cast; +use sys::TypeDesc; +use libc::size_t; #[abi = "rust-intrinsic"] extern mod rusti { diff --git a/src/libstd/base64.rs b/src/libstd/base64.rs index b606c75bfe5..00499895d56 100644 --- a/src/libstd/base64.rs +++ b/src/libstd/base64.rs @@ -1,6 +1,6 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -import io::Reader; +use io::Reader; trait ToBase64 { fn to_base64() -> ~str; diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs index da622625959..7a48f924079 100644 --- a/src/libstd/bitv.rs +++ b/src/libstd/bitv.rs @@ -1,4 +1,4 @@ -import vec::{to_mut, from_elem}; +use vec::{to_mut, from_elem}; export Bitv; export union; diff --git a/src/libstd/comm.rs b/src/libstd/comm.rs index 87ade69a5f3..b9934e425b9 100644 --- a/src/libstd/comm.rs +++ b/src/libstd/comm.rs @@ -8,7 +8,7 @@ Higher level communication abstractions. #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -import pipes::{Channel, Recv, Chan, Port, Selectable}; +use pipes::{Channel, Recv, Chan, Port, Selectable}; export DuplexStream; diff --git a/src/libstd/dbg.rs b/src/libstd/dbg.rs index d75fc75839f..68bd363f416 100644 --- a/src/libstd/dbg.rs +++ b/src/libstd/dbg.rs @@ -2,7 +2,7 @@ #[forbid(deprecated_pattern)]; //! Unsafe debugging functions for inspecting values. -import unsafe::reinterpret_cast; +use unsafe::reinterpret_cast; export debug_tydesc; export debug_opaque; diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs index 9f63d18c562..6cd229bc689 100644 --- a/src/libstd/deque.rs +++ b/src/libstd/deque.rs @@ -1,7 +1,7 @@ //! A deque. Untested as of yet. Likely buggy -import option::{Some, None}; -import dvec::DVec; +use option::{Some, None}; +use dvec::DVec; trait Deque { fn size() -> uint; diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs index 71de166795f..3e2ba9a24e5 100644 --- a/src/libstd/ebml.rs +++ b/src/libstd/ebml.rs @@ -1,8 +1,8 @@ // Simple Extensible Binary Markup Language (ebml) reader and writer on a // cursor model. See the specification here: // http://www.matroska.org/technical/specs/rfc/index.html -import core::Option; -import option::{Some, None}; +use core::Option; +use option::{Some, None}; export Doc; export doc_at; diff --git a/src/libstd/fun_treemap.rs b/src/libstd/fun_treemap.rs index 8ece067b904..e7a92e5d8cc 100644 --- a/src/libstd/fun_treemap.rs +++ b/src/libstd/fun_treemap.rs @@ -12,9 +12,9 @@ * of features. */ -import core::cmp::{Eq, Ord}; -import option::{Some, None}; -import option = option; +use core::cmp::{Eq, Ord}; +use option::{Some, None}; +use option = option; export Treemap; export init; diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs index 1db21e0ef37..49d4e8bc268 100644 --- a/src/libstd/getopts.rs +++ b/src/libstd/getopts.rs @@ -65,10 +65,10 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -import core::cmp::Eq; -import core::result::{Err, Ok}; -import core::option; -import core::option::{Some, None}; +use core::cmp::Eq; +use core::result::{Err, Ok}; +use core::option; +use core::option::{Some, None}; export Opt; export reqopt; export optopt; diff --git a/src/libstd/json.rs b/src/libstd/json.rs index a3f3ae9b70e..161fdf53b99 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -3,14 +3,11 @@ //! json serialization -import core::cmp::Eq; -import result::{Result, Ok, Err}; -import io; -import io::WriterUtil; -import map; -import map::hashmap; -import map::map; -import sort; +use core::cmp::Eq; +use result::{Result, Ok, Err}; +use io::WriterUtil; +use map::hashmap; +use map::map; export Json; export Error; diff --git a/src/libstd/list.rs b/src/libstd/list.rs index e1ff5c8b352..e73152cf1ac 100644 --- a/src/libstd/list.rs +++ b/src/libstd/list.rs @@ -2,10 +2,10 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -import core::cmp::Eq; -import core::option; -import option::*; -import option::{Some, None}; +use core::cmp::Eq; +use core::option; +use option::*; +use option::{Some, None}; enum list { cons(T, @list), diff --git a/src/libstd/map.rs b/src/libstd/map.rs index 20c48d6dda7..c7eba5bb8eb 100644 --- a/src/libstd/map.rs +++ b/src/libstd/map.rs @@ -3,14 +3,14 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -import io::WriterUtil; -import to_str::ToStr; -import managed::Managed; -import send_map::linear::LinearMap; +use io::WriterUtil; +use to_str::ToStr; +use managed::Managed; +use send_map::linear::LinearMap; -import core::cmp::Eq; -import hash::Hash; -import to_bytes::IterBytes; +use core::cmp::Eq; +use hash::Hash; +use to_bytes::IterBytes; export hashmap, hashfn, eqfn, set, map, chained, hashmap, str_hash; export box_str_hash; diff --git a/src/libstd/net.rs b/src/libstd/net.rs index e1d5b2a6370..8665ea2e9cf 100644 --- a/src/libstd/net.rs +++ b/src/libstd/net.rs @@ -1,10 +1,10 @@ //! Top-level module for network-related functionality -import tcp = net_tcp; +use tcp = net_tcp; export tcp; -import ip = net_ip; +use ip = net_ip; export ip; -import url = net_url; +use url = net_url; export url; \ No newline at end of file diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs index a2bccef57e5..125b2f5544a 100644 --- a/src/libstd/net_ip.rs +++ b/src/libstd/net_ip.rs @@ -1,25 +1,23 @@ //! Types/fns concerning Internet Protocol (IP), versions 4 & 6 -import vec; -import uint; -import iotask = uv::iotask::IoTask; -import interact = uv::iotask::interact; +use iotask = uv::iotask::IoTask; +use interact = uv::iotask::interact; -import sockaddr_in = uv::ll::sockaddr_in; -import sockaddr_in6 = uv::ll::sockaddr_in6; -import addrinfo = uv::ll::addrinfo; -import uv_getaddrinfo_t = uv::ll::uv_getaddrinfo_t; -import uv_ip4_addr = uv::ll::ip4_addr; -import uv_ip4_name = uv::ll::ip4_name; -import uv_ip6_addr = uv::ll::ip6_addr; -import uv_ip6_name = uv::ll::ip6_name; -import uv_getaddrinfo = uv::ll::getaddrinfo; -import uv_freeaddrinfo = uv::ll::freeaddrinfo; -import create_uv_getaddrinfo_t = uv::ll::getaddrinfo_t; -import set_data_for_req = uv::ll::set_data_for_req; -import get_data_for_req = uv::ll::get_data_for_req; -import ll = uv::ll; -import comm = core::comm; +use sockaddr_in = uv::ll::sockaddr_in; +use sockaddr_in6 = uv::ll::sockaddr_in6; +use addrinfo = uv::ll::addrinfo; +use uv_getaddrinfo_t = uv::ll::uv_getaddrinfo_t; +use uv_ip4_addr = uv::ll::ip4_addr; +use uv_ip4_name = uv::ll::ip4_name; +use uv_ip6_addr = uv::ll::ip6_addr; +use uv_ip6_name = uv::ll::ip6_name; +use uv_getaddrinfo = uv::ll::getaddrinfo; +use uv_freeaddrinfo = uv::ll::freeaddrinfo; +use create_uv_getaddrinfo_t = uv::ll::getaddrinfo_t; +use set_data_for_req = uv::ll::set_data_for_req; +use get_data_for_req = uv::ll::get_data_for_req; +use ll = uv::ll; +use comm = core::comm; export IpAddr, parse_addr_err; export format_addr; diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs index 255ce96e986..baddce5afe1 100644 --- a/src/libstd/net_tcp.rs +++ b/src/libstd/net_tcp.rs @@ -1,15 +1,15 @@ //! High-level interface to libuv's TCP functionality -import ip = net_ip; -import uv::iotask; -import uv::iotask::IoTask; -import future_spawn = future::spawn; +use ip = net_ip; +use uv::iotask; +use uv::iotask::IoTask; +use future_spawn = future::spawn; // FIXME #1935 // should be able to, but can't atm, replace w/ result::{result, extensions}; -import result::*; -import libc::size_t; -import io::{Reader, ReaderUtil, Writer}; -import comm = core::comm; +use result::*; +use libc::size_t; +use io::{Reader, ReaderUtil, Writer}; +use comm = core::comm; // tcp interfaces export TcpSocket; diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs index b670ae58ace..a502ab4239e 100644 --- a/src/libstd/net_url.rs +++ b/src/libstd/net_url.rs @@ -1,13 +1,12 @@ //! Types/fns concerning URLs (see RFC 3986) -import core::cmp::Eq; -import map; -import map::{hashmap, str_hash}; -import io::{Reader, ReaderUtil}; -import dvec::DVec; -import from_str::FromStr; -import result::{Err, Ok}; -import to_str::ToStr; +use core::cmp::Eq; +use map::{hashmap, str_hash}; +use io::{Reader, ReaderUtil}; +use dvec::DVec; +use from_str::FromStr; +use result::{Err, Ok}; +use to_str::ToStr; export Url, url, userinfo, query; export from_str, to_str; diff --git a/src/libstd/par.rs b/src/libstd/par.rs index 52366e33a27..97057ed20a5 100644 --- a/src/libstd/par.rs +++ b/src/libstd/par.rs @@ -1,4 +1,4 @@ -import future_spawn = future::spawn; +use future_spawn = future::spawn; export map, mapi, alli, any, mapi_factory; diff --git a/src/libstd/prettyprint.rs b/src/libstd/prettyprint.rs index d9e64d7b1a0..2976927a78f 100644 --- a/src/libstd/prettyprint.rs +++ b/src/libstd/prettyprint.rs @@ -1,9 +1,9 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -import io::Writer; -import io::WriterUtil; -import serialization::serializer; +use io::Writer; +use io::WriterUtil; +use serialization::serializer; impl Writer: serializer { fn emit_nil() { diff --git a/src/libstd/smallintmap.rs b/src/libstd/smallintmap.rs index 4535344b968..2173d67b100 100644 --- a/src/libstd/smallintmap.rs +++ b/src/libstd/smallintmap.rs @@ -2,10 +2,10 @@ * A simple map based on a vector for small integer keys. Space requirements * are O(highest integer key). */ -import core::option; -import core::option::{Some, None}; -import dvec::DVec; -import map::map; +use core::option; +use core::option::{Some, None}; +use dvec::DVec; +use map::map; // FIXME (#2347): Should not be @; there's a bug somewhere in rustc that // requires this to be. diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs index 00396e0e773..fc5ffa3384c 100644 --- a/src/libstd/sort.rs +++ b/src/libstd/sort.rs @@ -2,8 +2,8 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -import vec::{len, push}; -import core::cmp::{Eq, Ord}; +use vec::{len, push}; +use core::cmp::{Eq, Ord}; export le; export merge_sort; diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs index b64376892e7..d11c3419f7a 100644 --- a/src/libstd/sync.rs +++ b/src/libstd/sync.rs @@ -11,7 +11,7 @@ export Condvar, Semaphore, Mutex, mutex_with_condvars; export RWlock, rwlock_with_condvars, RWlockReadMode, RWlockWriteMode; -import unsafe::{Exclusive, exclusive}; +use unsafe::{Exclusive, exclusive}; /**************************************************************************** * Internals diff --git a/src/libstd/tempfile.rs b/src/libstd/tempfile.rs index 5d2a04c0388..8b6b306d6b6 100644 --- a/src/libstd/tempfile.rs +++ b/src/libstd/tempfile.rs @@ -3,9 +3,8 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -import core::option; -import option::{None, Some}; -import rand; +use core::option; +use option::{None, Some}; fn mkdtemp(tmpdir: &Path, suffix: &str) -> Option { let r = rand::Rng(); diff --git a/src/libstd/term.rs b/src/libstd/term.rs index 424e4b61eb0..7c6528b1137 100644 --- a/src/libstd/term.rs +++ b/src/libstd/term.rs @@ -1,6 +1,6 @@ //! Simple ANSI color library -import core::Option; +use core::Option; // FIXME (#2807): Windows support. diff --git a/src/libstd/test.rs b/src/libstd/test.rs index dff9cbc1559..8e8380c6883 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -5,13 +5,13 @@ // simplest interface possible for representing and running tests // while providing a base that other test frameworks may build off of. -import core::cmp::Eq; -import either::Either; -import result::{Ok, Err}; -import io::WriterUtil; -import libc::size_t; -import task::TaskBuilder; -import comm = core::comm; +use core::cmp::Eq; +use either::Either; +use result::{Ok, Err}; +use io::WriterUtil; +use libc::size_t; +use task::TaskBuilder; +use comm = core::comm; export test_name; export test_fn; diff --git a/src/libstd/time.rs b/src/libstd/time.rs index 3867ae35843..86104c117b5 100644 --- a/src/libstd/time.rs +++ b/src/libstd/time.rs @@ -1,10 +1,10 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -import core::cmp::Eq; -import libc::{c_char, c_int, c_long, size_t, time_t}; -import io::Reader; -import result::{Result, Ok, Err}; +use core::cmp::Eq; +use libc::{c_char, c_int, c_long, size_t, time_t}; +use io::Reader; +use result::{Result, Ok, Err}; export Timespec, diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs index ff0130b7783..25bc5e58c4e 100644 --- a/src/libstd/timer.rs +++ b/src/libstd/timer.rs @@ -3,10 +3,10 @@ #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -import uv = uv; -import uv::iotask; -import iotask::IoTask; -import comm = core::comm; +use uv = uv; +use uv::iotask; +use iotask::IoTask; +use comm = core::comm; export delayed_send, sleep, recv_timeout; diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs index 4a5dc3656b9..8eee59e029c 100644 --- a/src/libstd/treemap.rs +++ b/src/libstd/treemap.rs @@ -6,9 +6,9 @@ * red-black tree or something else. */ -import core::cmp::{Eq, Ord}; -import core::option::{Some, None}; -import Option = core::Option; +use core::cmp::{Eq, Ord}; +use core::option::{Some, None}; +use Option = core::Option; export treemap; export insert; diff --git a/src/libstd/uv.rs b/src/libstd/uv.rs index 50f5d9704fa..311c9f28dd8 100644 --- a/src/libstd/uv.rs +++ b/src/libstd/uv.rs @@ -23,11 +23,11 @@ * facilities. */ -import ll = uv_ll; +use ll = uv_ll; export ll; -import iotask = uv_iotask; +use iotask = uv_iotask; export iotask; -import global_loop = uv_global_loop; +use global_loop = uv_global_loop; export global_loop; diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs index 4fec4dda439..4713efd96b3 100644 --- a/src/libstd/uv_global_loop.rs +++ b/src/libstd/uv_global_loop.rs @@ -2,15 +2,15 @@ export get; -import ll = uv_ll; -import iotask = uv_iotask; -import get_gl = get; -import iotask::{IoTask, spawn_iotask}; -import priv::{chan_from_global_ptr, weaken_task}; -import comm = core::comm; -import comm::{Port, Chan, select2, listen}; -import task::TaskBuilder; -import either::{Left, Right}; +use ll = uv_ll; +use iotask = uv_iotask; +use get_gl = get; +use iotask::{IoTask, spawn_iotask}; +use priv::{chan_from_global_ptr, weaken_task}; +use comm = core::comm; +use comm::{Port, Chan, select2, listen}; +use task::TaskBuilder; +use either::{Left, Right}; extern mod rustrt { fn rust_uv_get_kernel_global_chan_ptr() -> *libc::uintptr_t; diff --git a/src/libstd/uv_iotask.rs b/src/libstd/uv_iotask.rs index 42cc2e1cb60..6b2b9aa7210 100644 --- a/src/libstd/uv_iotask.rs +++ b/src/libstd/uv_iotask.rs @@ -10,12 +10,12 @@ export spawn_iotask; export interact; export exit; -import libc::c_void; -import ptr::addr_of; -import comm = core::comm; -import comm::{Port, Chan, listen}; -import task::TaskBuilder; -import ll = uv_ll; +use libc::c_void; +use ptr::addr_of; +use comm = core::comm; +use comm::{Port, Chan, listen}; +use task::TaskBuilder; +use ll = uv_ll; /// Used to abstract-away direct interaction with a libuv loop. enum IoTask { diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs index b9331ad254a..7b7fad5b9d4 100644 --- a/src/libstd/uv_ll.rs +++ b/src/libstd/uv_ll.rs @@ -22,9 +22,9 @@ #[allow(non_camel_case_types)]; // C types -import libc::size_t; -import comm = core::comm; -import ptr::to_unsafe_ptr; +use libc::size_t; +use comm = core::comm; +use ptr::to_unsafe_ptr; // libuv struct mappings type uv_ip4_addr = {