Skip to content

Commit 7d941fa

Browse files
nagisanagisa
committed
Replace some uses of deprecated os functions
This commit mostly replaces some of the uses of os::args with env::args.
1 parent 839311c commit 7d941fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+223
-255
lines changed

‎src/rustbook/build.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//! Implementation of the `build` subcommand, used to compile a book.
1212
1313
use std::os;
14+
use std::env;
1415
use std::old_io;
1516
use std::old_io::{fs, File, BufferedWriter, TempDir, IoResult};
1617

@@ -80,10 +81,10 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
8081
let out_path = tgt.join(item.path.dirname());
8182

8283
let src;
83-
if os::args().len() < 3 {
84+
if env::args().len() < 3 {
8485
src = os::getcwd().unwrap().clone();
8586
} else {
86-
src = Path::new(os::args()[2].clone());
87+
src = Path::new(env::args().nth(2).unwrap().clone());
8788
}
8889
// preprocess the markdown, rerouting markdown references to html references
8990
let markdown_data = try!(File::open(&src.join(&item.path)).read_to_string());
@@ -153,16 +154,16 @@ impl Subcommand for Build {
153154
let src;
154155
let tgt;
155156

156-
if os::args().len() < 3 {
157+
if env::args().len() < 3 {
157158
src = cwd.clone();
158159
} else {
159-
src = Path::new(os::args()[2].clone());
160+
src = Path::new(env::args().nth(2).unwrap().clone());
160161
}
161162

162-
if os::args().len() < 4 {
163+
if env::args().len() < 4 {
163164
tgt = cwd.join("_book");
164165
} else {
165-
tgt = Path::new(os::args()[3].clone());
166+
tgt = Path::new(env::args().nth(3).unwrap().clone());
166167
}
167168

168169
try!(fs::mkdir(&tgt, old_io::USER_DIR));

‎src/rustbook/main.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
#![feature(core)]
1414
#![feature(io)]
1515
#![feature(os)]
16+
#![feature(env)]
1617
#![feature(path)]
1718
#![feature(rustdoc)]
1819

1920
extern crate rustdoc;
2021

21-
use std::os;
22+
use std::env;
2223
use subcommand::Subcommand;
2324
use term::Term;
2425

@@ -48,7 +49,7 @@ mod javascript;
4849
#[cfg(not(test))] // thanks #12327
4950
fn main() {
5051
let mut term = Term::new();
51-
let cmd = os::args();
52+
let cmd: Vec<_> = env::args().collect();
5253

5354
if cmd.len() < 1 {
5455
help::usage()

‎src/rustbook/term.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//! An abstraction of the terminal. Eventually, provide color and
1212
//! verbosity support. For now, just a wrapper around stdout/stderr.
1313
14-
use std::os;
14+
use std::env;
1515
use std::old_io::stdio;
1616

1717
pub struct Term {
@@ -28,6 +28,6 @@ impl Term {
2828
pub fn err(&mut self, msg: &str) {
2929
// swallow any errors
3030
let _ = self.err.write_line(msg);
31-
os::set_exit_status(101);
31+
env::set_exit_status(101);
3232
}
3333
}

‎src/test/bench/core-map.rs

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#![feature(unboxed_closures)]
1212

1313
use std::collections::{BTreeMap, HashMap, HashSet};
14-
use std::os;
14+
use std::env;
1515
use std::rand::{Rng, IsaacRng, SeedableRng};
1616
use std::time::Duration;
1717

@@ -20,33 +20,33 @@ fn timed<F>(label: &str, f: F) where F: FnMut() {
2020
}
2121

2222
trait MutableMap {
23-
fn insert(&mut self, k: uint, v: uint);
24-
fn remove(&mut self, k: &uint) -> bool;
25-
fn find(&self, k: &uint) -> Option<&uint>;
23+
fn insert(&mut self, k: usize, v: usize);
24+
fn remove(&mut self, k: &usize) -> bool;
25+
fn find(&self, k: &usize) -> Option<&usize>;
2626
}
2727

28-
impl MutableMap for BTreeMap<uint, uint> {
29-
fn insert(&mut self, k: uint, v: uint) { self.insert(k, v); }
30-
fn remove(&mut self, k: &uint) -> bool { self.remove(k).is_some() }
31-
fn find(&self, k: &uint) -> Option<&uint> { self.get(k) }
28+
impl MutableMap for BTreeMap<usize, usize> {
29+
fn insert(&mut self, k: usize, v: usize) { self.insert(k, v); }
30+
fn remove(&mut self, k: &usize) -> bool { self.remove(k).is_some() }
31+
fn find(&self, k: &usize) -> Option<&usize> { self.get(k) }
3232
}
33-
impl MutableMap for HashMap<uint, uint> {
34-
fn insert(&mut self, k: uint, v: uint) { self.insert(k, v); }
35-
fn remove(&mut self, k: &uint) -> bool { self.remove(k).is_some() }
36-
fn find(&self, k: &uint) -> Option<&uint> { self.get(k) }
33+
impl MutableMap for HashMap<usize, usize> {
34+
fn insert(&mut self, k: usize, v: usize) { self.insert(k, v); }
35+
fn remove(&mut self, k: &usize) -> bool { self.remove(k).is_some() }
36+
fn find(&self, k: &usize) -> Option<&usize> { self.get(k) }
3737
}
3838

39-
fn ascending<M: MutableMap>(map: &mut M, n_keys: uint) {
39+
fn ascending<M: MutableMap>(map: &mut M, n_keys: usize) {
4040
println!(" Ascending integers:");
4141

4242
timed("insert", || {
43-
for i in 0u..n_keys {
43+
for i in 0..n_keys {
4444
map.insert(i, i + 1);
4545
}
4646
});
4747

4848
timed("search", || {
49-
for i in 0u..n_keys {
49+
for i in 0..n_keys {
5050
assert_eq!(map.find(&i).unwrap(), &(i + 1));
5151
}
5252
});
@@ -58,7 +58,7 @@ fn ascending<M: MutableMap>(map: &mut M, n_keys: uint) {
5858
});
5959
}
6060

61-
fn descending<M: MutableMap>(map: &mut M, n_keys: uint) {
61+
fn descending<M: MutableMap>(map: &mut M, n_keys: usize) {
6262
println!(" Descending integers:");
6363

6464
timed("insert", || {
@@ -80,32 +80,31 @@ fn descending<M: MutableMap>(map: &mut M, n_keys: uint) {
8080
});
8181
}
8282

83-
fn vector<M: MutableMap>(map: &mut M, n_keys: uint, dist: &[uint]) {
83+
fn vector<M: MutableMap>(map: &mut M, n_keys: usize, dist: &[usize]) {
8484
timed("insert", || {
85-
for i in 0u..n_keys {
85+
for i in 0..n_keys {
8686
map.insert(dist[i], i + 1);
8787
}
8888
});
8989

9090
timed("search", || {
91-
for i in 0u..n_keys {
91+
for i in 0..n_keys {
9292
assert_eq!(map.find(&dist[i]).unwrap(), &(i + 1));
9393
}
9494
});
9595

9696
timed("remove", || {
97-
for i in 0u..n_keys {
97+
for i in 0..n_keys {
9898
assert!(map.remove(&dist[i]));
9999
}
100100
});
101101
}
102102

103103
fn main() {
104-
let args = os::args();
105-
let args = args;
104+
let mut args = env::args();
106105
let n_keys = {
107106
if args.len() == 2 {
108-
args[1].parse::<uint>().unwrap()
107+
args.nth(1).unwrap().parse::<usize>().unwrap()
109108
} else {
110109
1000000
111110
}
@@ -131,37 +130,37 @@ fn main() {
131130
println!("{}", "\nBTreeMap:");
132131

133132
{
134-
let mut map: BTreeMap<uint,uint> = BTreeMap::new();
133+
let mut map: BTreeMap<usize,usize> = BTreeMap::new();
135134
ascending(&mut map, n_keys);
136135
}
137136

138137
{
139-
let mut map: BTreeMap<uint,uint> = BTreeMap::new();
138+
let mut map: BTreeMap<usize,usize> = BTreeMap::new();
140139
descending(&mut map, n_keys);
141140
}
142141

143142
{
144143
println!(" Random integers:");
145-
let mut map: BTreeMap<uint,uint> = BTreeMap::new();
144+
let mut map: BTreeMap<usize,usize> = BTreeMap::new();
146145
vector(&mut map, n_keys, &rand);
147146
}
148147

149148
// FIXME: #9970
150149
println!("{}", "\nHashMap:");
151150

152151
{
153-
let mut map: HashMap<uint,uint> = HashMap::new();
152+
let mut map: HashMap<usize,usize> = HashMap::new();
154153
ascending(&mut map, n_keys);
155154
}
156155

157156
{
158-
let mut map: HashMap<uint,uint> = HashMap::new();
157+
let mut map: HashMap<usize,usize> = HashMap::new();
159158
descending(&mut map, n_keys);
160159
}
161160

162161
{
163162
println!(" Random integers:");
164-
let mut map: HashMap<uint,uint> = HashMap::new();
163+
let mut map: HashMap<usize,usize> = HashMap::new();
165164
vector(&mut map, n_keys, &rand);
166165
}
167166
}

‎src/test/bench/core-set.rs

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use std::collections::BitvSet;
2020
use std::collections::HashSet;
2121
use std::collections::hash_map::Hasher;
2222
use std::hash::Hash;
23-
use std::os;
23+
use std::env;
2424
use std::time::Duration;
2525

2626
struct Results {
@@ -53,29 +53,29 @@ impl<T: Ord> MutableSet<T> for BTreeSet<T> {
5353
fn remove(&mut self, k: &T) -> bool { self.remove(k) }
5454
fn contains(&self, k: &T) -> bool { self.contains(k) }
5555
}
56-
impl MutableSet<uint> for BitvSet {
57-
fn insert(&mut self, k: uint) { self.insert(k); }
58-
fn remove(&mut self, k: &uint) -> bool { self.remove(k) }
59-
fn contains(&self, k: &uint) -> bool { self.contains(k) }
56+
impl MutableSet<usize> for BitvSet {
57+
fn insert(&mut self, k: usize) { self.insert(k); }
58+
fn remove(&mut self, k: &usize) -> bool { self.remove(k) }
59+
fn contains(&self, k: &usize) -> bool { self.contains(k) }
6060
}
6161

6262
impl Results {
63-
pub fn bench_int<T:MutableSet<uint>,
63+
pub fn bench_int<T:MutableSet<usize>,
6464
R:rand::Rng,
6565
F:FnMut() -> T>(
6666
&mut self,
6767
rng: &mut R,
68-
num_keys: uint,
69-
rand_cap: uint,
68+
num_keys: usize,
69+
rand_cap: usize,
7070
mut f: F) {
7171
{
7272
let mut set = f();
7373
timed(&mut self.sequential_ints, || {
74-
for i in 0u..num_keys {
74+
for i in 0..num_keys {
7575
set.insert(i);
7676
}
7777

78-
for i in 0u..num_keys {
78+
for i in 0..num_keys {
7979
assert!(set.contains(&i));
8080
}
8181
})
@@ -85,19 +85,19 @@ impl Results {
8585
let mut set = f();
8686
timed(&mut self.random_ints, || {
8787
for _ in 0..num_keys {
88-
set.insert(rng.gen::<uint>() % rand_cap);
88+
set.insert(rng.gen::<usize>() % rand_cap);
8989
}
9090
})
9191
}
9292

9393
{
9494
let mut set = f();
95-
for i in 0u..num_keys {
95+
for i in 0..num_keys {
9696
set.insert(i);
9797
}
9898

9999
timed(&mut self.delete_ints, || {
100-
for i in 0u..num_keys {
100+
for i in 0..num_keys {
101101
assert!(set.remove(&i));
102102
}
103103
})
@@ -109,16 +109,16 @@ impl Results {
109109
F:FnMut() -> T>(
110110
&mut self,
111111
rng: &mut R,
112-
num_keys: uint,
112+
num_keys: usize,
113113
mut f: F) {
114114
{
115115
let mut set = f();
116116
timed(&mut self.sequential_strings, || {
117-
for i in 0u..num_keys {
117+
for i in 0..num_keys {
118118
set.insert(i.to_string());
119119
}
120120

121-
for i in 0u..num_keys {
121+
for i in 0..num_keys {
122122
assert!(set.contains(&i.to_string()));
123123
}
124124
})
@@ -128,19 +128,19 @@ impl Results {
128128
let mut set = f();
129129
timed(&mut self.random_strings, || {
130130
for _ in 0..num_keys {
131-
let s = rng.gen::<uint>().to_string();
131+
let s = rng.gen::<usize>().to_string();
132132
set.insert(s);
133133
}
134134
})
135135
}
136136

137137
{
138138
let mut set = f();
139-
for i in 0u..num_keys {
139+
for i in 0..num_keys {
140140
set.insert(i.to_string());
141141
}
142142
timed(&mut self.delete_strings, || {
143-
for i in 0u..num_keys {
143+
for i in 0..num_keys {
144144
assert!(set.remove(&i.to_string()));
145145
}
146146
})
@@ -179,11 +179,10 @@ fn empty_results() -> Results {
179179
}
180180

181181
fn main() {
182-
let args = os::args();
183-
let args = args;
182+
let mut args = env::args();
184183
let num_keys = {
185184
if args.len() == 2 {
186-
args[1].parse::<uint>().unwrap()
185+
args.nth(1).unwrap().parse::<usize>().unwrap()
187186
} else {
188187
100 // woefully inadequate for any real measurement
189188
}
@@ -196,7 +195,7 @@ fn main() {
196195
let mut rng: rand::IsaacRng = rand::SeedableRng::from_seed(seed);
197196
let mut results = empty_results();
198197
results.bench_int(&mut rng, num_keys, max, || {
199-
let s: HashSet<uint> = HashSet::new();
198+
let s: HashSet<usize> = HashSet::new();
200199
s
201200
});
202201
results.bench_str(&mut rng, num_keys, || {
@@ -210,7 +209,7 @@ fn main() {
210209
let mut rng: rand::IsaacRng = rand::SeedableRng::from_seed(seed);
211210
let mut results = empty_results();
212211
results.bench_int(&mut rng, num_keys, max, || {
213-
let s: BTreeSet<uint> = BTreeSet::new();
212+
let s: BTreeSet<usize> = BTreeSet::new();
214213
s
215214
});
216215
results.bench_str(&mut rng, num_keys, || {

‎src/test/bench/core-std.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use std::old_io::File;
1717
use std::iter::repeat;
1818
use std::mem::swap;
19-
use std::os;
2019
use std::env;
2120
use std::rand::Rng;
2221
use std::rand;
@@ -25,8 +24,7 @@ use std::time::Duration;
2524
use std::vec;
2625

2726
fn main() {
28-
let argv = os::args();
29-
let _tests = &argv[1..argv.len()];
27+
let argv: Vec<String> = env::args().collect();
3028

3129
macro_rules! bench {
3230
($id:ident) =>

0 commit comments

Comments
 (0)