Skip to content

Commit b0af5ec

Browse files
pcwaltonpcwalton
committed
---
yaml --- r: 30298 b: refs/heads/incoming c: 2d690ae h: refs/heads/master v: v3
1 parent 502f495 commit b0af5ec

33 files changed

+127
-136
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 437073868e590ff8d1aae7a6fad1d8c49056f0b0
9+
refs/heads/incoming: 2d690ae43f77a6c4e1f8ba10afd32926e2459e8e
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/incoming/src/libstd/arc.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
* between tasks.
77
*/
88

9-
import unsafe::{SharedMutableState, shared_mutable_state,
9+
use unsafe::{SharedMutableState, shared_mutable_state,
1010
clone_shared_mutable_state, unwrap_shared_mutable_state,
1111
get_shared_mutable_state, get_shared_immutable_state};
12-
import sync;
13-
import sync::{Mutex, mutex_with_condvars,
12+
use sync::{Mutex, mutex_with_condvars,
1413
RWlock, rwlock_with_condvars};
1514

1615
export ARC, clone, get;

‎branches/incoming/src/libstd/arena.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@
2424

2525
export Arena, arena_with_size;
2626

27-
import list;
28-
import list::{list, cons, nil};
29-
import unsafe::reinterpret_cast;
30-
import sys::TypeDesc;
31-
import libc::size_t;
27+
use list::{list, cons, nil};
28+
use unsafe::reinterpret_cast;
29+
use sys::TypeDesc;
30+
use libc::size_t;
3231

3332
#[abi = "rust-intrinsic"]
3433
extern mod rusti {

‎branches/incoming/src/libstd/base64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#[forbid(deprecated_mode)];
22
#[forbid(deprecated_pattern)];
3-
import io::Reader;
3+
use io::Reader;
44

55
trait ToBase64 {
66
fn to_base64() -> ~str;

‎branches/incoming/src/libstd/bitv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import vec::{to_mut, from_elem};
1+
use vec::{to_mut, from_elem};
22

33
export Bitv;
44
export union;

‎branches/incoming/src/libstd/comm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Higher level communication abstractions.
88
#[forbid(deprecated_mode)];
99
#[forbid(deprecated_pattern)];
1010

11-
import pipes::{Channel, Recv, Chan, Port, Selectable};
11+
use pipes::{Channel, Recv, Chan, Port, Selectable};
1212

1313
export DuplexStream;
1414

‎branches/incoming/src/libstd/dbg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#[forbid(deprecated_pattern)];
33
//! Unsafe debugging functions for inspecting values.
44
5-
import unsafe::reinterpret_cast;
5+
use unsafe::reinterpret_cast;
66

77
export debug_tydesc;
88
export debug_opaque;

‎branches/incoming/src/libstd/deque.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! A deque. Untested as of yet. Likely buggy
22
3-
import option::{Some, None};
4-
import dvec::DVec;
3+
use option::{Some, None};
4+
use dvec::DVec;
55

66
trait Deque<T> {
77
fn size() -> uint;

‎branches/incoming/src/libstd/ebml.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Simple Extensible Binary Markup Language (ebml) reader and writer on a
22
// cursor model. See the specification here:
33
// http://www.matroska.org/technical/specs/rfc/index.html
4-
import core::Option;
5-
import option::{Some, None};
4+
use core::Option;
5+
use option::{Some, None};
66

77
export Doc;
88
export doc_at;

‎branches/incoming/src/libstd/fun_treemap.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* of features.
1313
*/
1414

15-
import core::cmp::{Eq, Ord};
16-
import option::{Some, None};
17-
import option = option;
15+
use core::cmp::{Eq, Ord};
16+
use option::{Some, None};
17+
use option = option;
1818

1919
export Treemap;
2020
export init;

‎branches/incoming/src/libstd/getopts.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@
6565
#[forbid(deprecated_mode)];
6666
#[forbid(deprecated_pattern)];
6767

68-
import core::cmp::Eq;
69-
import core::result::{Err, Ok};
70-
import core::option;
71-
import core::option::{Some, None};
68+
use core::cmp::Eq;
69+
use core::result::{Err, Ok};
70+
use core::option;
71+
use core::option::{Some, None};
7272
export Opt;
7373
export reqopt;
7474
export optopt;

‎branches/incoming/src/libstd/json.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@
33

44
//! json serialization
55
6-
import core::cmp::Eq;
7-
import result::{Result, Ok, Err};
8-
import io;
9-
import io::WriterUtil;
10-
import map;
11-
import map::hashmap;
12-
import map::map;
13-
import sort;
6+
use core::cmp::Eq;
7+
use result::{Result, Ok, Err};
8+
use io::WriterUtil;
9+
use map::hashmap;
10+
use map::map;
1411

1512
export Json;
1613
export Error;

‎branches/incoming/src/libstd/list.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
#[forbid(deprecated_mode)];
33
#[forbid(deprecated_pattern)];
44

5-
import core::cmp::Eq;
6-
import core::option;
7-
import option::*;
8-
import option::{Some, None};
5+
use core::cmp::Eq;
6+
use core::option;
7+
use option::*;
8+
use option::{Some, None};
99

1010
enum list<T> {
1111
cons(T, @list<T>),

‎branches/incoming/src/libstd/map.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
#[forbid(deprecated_mode)];
44
#[forbid(deprecated_pattern)];
55

6-
import io::WriterUtil;
7-
import to_str::ToStr;
8-
import managed::Managed;
9-
import send_map::linear::LinearMap;
10-
11-
import core::cmp::Eq;
12-
import hash::Hash;
13-
import to_bytes::IterBytes;
6+
use io::WriterUtil;
7+
use to_str::ToStr;
8+
use managed::Managed;
9+
use send_map::linear::LinearMap;
10+
11+
use core::cmp::Eq;
12+
use hash::Hash;
13+
use to_bytes::IterBytes;
1414

1515
export hashmap, hashfn, eqfn, set, map, chained, hashmap, str_hash;
1616
export box_str_hash;

‎branches/incoming/src/libstd/net.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//! Top-level module for network-related functionality
22
3-
import tcp = net_tcp;
3+
use tcp = net_tcp;
44
export tcp;
55

6-
import ip = net_ip;
6+
use ip = net_ip;
77
export ip;
88

9-
import url = net_url;
9+
use url = net_url;
1010
export url;

‎branches/incoming/src/libstd/net_ip.rs

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
//! Types/fns concerning Internet Protocol (IP), versions 4 & 6
22
3-
import vec;
4-
import uint;
5-
import iotask = uv::iotask::IoTask;
6-
import interact = uv::iotask::interact;
3+
use iotask = uv::iotask::IoTask;
4+
use interact = uv::iotask::interact;
75

8-
import sockaddr_in = uv::ll::sockaddr_in;
9-
import sockaddr_in6 = uv::ll::sockaddr_in6;
10-
import addrinfo = uv::ll::addrinfo;
11-
import uv_getaddrinfo_t = uv::ll::uv_getaddrinfo_t;
12-
import uv_ip4_addr = uv::ll::ip4_addr;
13-
import uv_ip4_name = uv::ll::ip4_name;
14-
import uv_ip6_addr = uv::ll::ip6_addr;
15-
import uv_ip6_name = uv::ll::ip6_name;
16-
import uv_getaddrinfo = uv::ll::getaddrinfo;
17-
import uv_freeaddrinfo = uv::ll::freeaddrinfo;
18-
import create_uv_getaddrinfo_t = uv::ll::getaddrinfo_t;
19-
import set_data_for_req = uv::ll::set_data_for_req;
20-
import get_data_for_req = uv::ll::get_data_for_req;
21-
import ll = uv::ll;
22-
import comm = core::comm;
6+
use sockaddr_in = uv::ll::sockaddr_in;
7+
use sockaddr_in6 = uv::ll::sockaddr_in6;
8+
use addrinfo = uv::ll::addrinfo;
9+
use uv_getaddrinfo_t = uv::ll::uv_getaddrinfo_t;
10+
use uv_ip4_addr = uv::ll::ip4_addr;
11+
use uv_ip4_name = uv::ll::ip4_name;
12+
use uv_ip6_addr = uv::ll::ip6_addr;
13+
use uv_ip6_name = uv::ll::ip6_name;
14+
use uv_getaddrinfo = uv::ll::getaddrinfo;
15+
use uv_freeaddrinfo = uv::ll::freeaddrinfo;
16+
use create_uv_getaddrinfo_t = uv::ll::getaddrinfo_t;
17+
use set_data_for_req = uv::ll::set_data_for_req;
18+
use get_data_for_req = uv::ll::get_data_for_req;
19+
use ll = uv::ll;
20+
use comm = core::comm;
2321

2422
export IpAddr, parse_addr_err;
2523
export format_addr;

‎branches/incoming/src/libstd/net_tcp.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
//! High-level interface to libuv's TCP functionality
22
3-
import ip = net_ip;
4-
import uv::iotask;
5-
import uv::iotask::IoTask;
6-
import future_spawn = future::spawn;
3+
use ip = net_ip;
4+
use uv::iotask;
5+
use uv::iotask::IoTask;
6+
use future_spawn = future::spawn;
77
// FIXME #1935
88
// should be able to, but can't atm, replace w/ result::{result, extensions};
9-
import result::*;
10-
import libc::size_t;
11-
import io::{Reader, ReaderUtil, Writer};
12-
import comm = core::comm;
9+
use result::*;
10+
use libc::size_t;
11+
use io::{Reader, ReaderUtil, Writer};
12+
use comm = core::comm;
1313

1414
// tcp interfaces
1515
export TcpSocket;

‎branches/incoming/src/libstd/net_url.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
//! Types/fns concerning URLs (see RFC 3986)
22
3-
import core::cmp::Eq;
4-
import map;
5-
import map::{hashmap, str_hash};
6-
import io::{Reader, ReaderUtil};
7-
import dvec::DVec;
8-
import from_str::FromStr;
9-
import result::{Err, Ok};
10-
import to_str::ToStr;
3+
use core::cmp::Eq;
4+
use map::{hashmap, str_hash};
5+
use io::{Reader, ReaderUtil};
6+
use dvec::DVec;
7+
use from_str::FromStr;
8+
use result::{Err, Ok};
9+
use to_str::ToStr;
1110

1211
export Url, url, userinfo, query;
1312
export from_str, to_str;

‎branches/incoming/src/libstd/par.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import future_spawn = future::spawn;
1+
use future_spawn = future::spawn;
22

33
export map, mapi, alli, any, mapi_factory;
44

‎branches/incoming/src/libstd/prettyprint.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#[forbid(deprecated_mode)];
22
#[forbid(deprecated_pattern)];
33

4-
import io::Writer;
5-
import io::WriterUtil;
6-
import serialization::serializer;
4+
use io::Writer;
5+
use io::WriterUtil;
6+
use serialization::serializer;
77

88
impl Writer: serializer {
99
fn emit_nil() {

‎branches/incoming/src/libstd/smallintmap.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
* A simple map based on a vector for small integer keys. Space requirements
33
* are O(highest integer key).
44
*/
5-
import core::option;
6-
import core::option::{Some, None};
7-
import dvec::DVec;
8-
import map::map;
5+
use core::option;
6+
use core::option::{Some, None};
7+
use dvec::DVec;
8+
use map::map;
99

1010
// FIXME (#2347): Should not be @; there's a bug somewhere in rustc that
1111
// requires this to be.

‎branches/incoming/src/libstd/sort.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#[forbid(deprecated_mode)];
33
#[forbid(deprecated_pattern)];
44

5-
import vec::{len, push};
6-
import core::cmp::{Eq, Ord};
5+
use vec::{len, push};
6+
use core::cmp::{Eq, Ord};
77

88
export le;
99
export merge_sort;

‎branches/incoming/src/libstd/sync.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
export Condvar, Semaphore, Mutex, mutex_with_condvars;
1212
export RWlock, rwlock_with_condvars, RWlockReadMode, RWlockWriteMode;
1313

14-
import unsafe::{Exclusive, exclusive};
14+
use unsafe::{Exclusive, exclusive};
1515

1616
/****************************************************************************
1717
* Internals

‎branches/incoming/src/libstd/tempfile.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
#[forbid(deprecated_mode)];
44
#[forbid(deprecated_pattern)];
55

6-
import core::option;
7-
import option::{None, Some};
8-
import rand;
6+
use core::option;
7+
use option::{None, Some};
98

109
fn mkdtemp(tmpdir: &Path, suffix: &str) -> Option<Path> {
1110
let r = rand::Rng();

‎branches/incoming/src/libstd/term.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Simple ANSI color library
22
3-
import core::Option;
3+
use core::Option;
44

55
// FIXME (#2807): Windows support.
66

‎branches/incoming/src/libstd/test.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
// simplest interface possible for representing and running tests
66
// while providing a base that other test frameworks may build off of.
77

8-
import core::cmp::Eq;
9-
import either::Either;
10-
import result::{Ok, Err};
11-
import io::WriterUtil;
12-
import libc::size_t;
13-
import task::TaskBuilder;
14-
import comm = core::comm;
8+
use core::cmp::Eq;
9+
use either::Either;
10+
use result::{Ok, Err};
11+
use io::WriterUtil;
12+
use libc::size_t;
13+
use task::TaskBuilder;
14+
use comm = core::comm;
1515

1616
export test_name;
1717
export test_fn;

‎branches/incoming/src/libstd/time.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#[forbid(deprecated_mode)];
22
#[forbid(deprecated_pattern)];
33

4-
import core::cmp::Eq;
5-
import libc::{c_char, c_int, c_long, size_t, time_t};
6-
import io::Reader;
7-
import result::{Result, Ok, Err};
4+
use core::cmp::Eq;
5+
use libc::{c_char, c_int, c_long, size_t, time_t};
6+
use io::Reader;
7+
use result::{Result, Ok, Err};
88

99
export
1010
Timespec,

0 commit comments

Comments
 (0)