Skip to content

Commit fe2089d

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 126969 b: refs/heads/snap-stage3 c: e156d00 h: refs/heads/master i: 126967: 68995f4 v: v3
1 parent 85bdb57 commit fe2089d

File tree

30 files changed

+260
-718
lines changed

30 files changed

+260
-718
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 7be8f0af0393dcdb077c2f6b1653836fd3fba235
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: f6814206247d20a523e3cb1def5dad704c019cb1
4+
refs/heads/snap-stage3: e156d001c6577593295f6eee417ea8758fbc4a84
55
refs/heads/try: 502e4c045236682e9728539dc0d2b3d0b237f55c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/src/libcollections/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ impl String {
688688
/// assert_eq!(s.shift_char(), Some('o'));
689689
/// assert_eq!(s.shift_char(), None);
690690
/// ```
691-
pub fn shift_char(&mut self) -> Option<char> {
691+
pub fn shift_char (&mut self) -> Option<char> {
692692
let len = self.len();
693693
if len == 0 {
694694
return None

‎branches/snap-stage3/src/libgreen/sched.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ impl Scheduler {
219219
let message = stask.sched.get_mut_ref().message_queue.pop();
220220
rtassert!(match message { msgq::Empty => true, _ => false });
221221

222-
stask.task.get_mut_ref().destroyed = true;
222+
stask.task.take().unwrap().drop();
223223
}
224224

225225
// This does not return a scheduler, as the scheduler is placed

‎branches/snap-stage3/src/librustc/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ extern crate time;
4848
#[phase(plugin, link)] extern crate log;
4949
#[phase(plugin, link)] extern crate syntax;
5050

51-
#[cfg(test)]
52-
extern crate test;
53-
5451
mod diagnostics;
5552

5653
pub mod back {
@@ -132,7 +129,6 @@ pub mod util {
132129

133130
pub mod common;
134131
pub mod ppaux;
135-
pub mod io;
136132
pub mod nodemap;
137133
}
138134

‎branches/snap-stage3/src/librustc/metadata/encoder.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ use middle::ty;
2626
use middle::typeck;
2727
use middle::stability;
2828
use middle;
29-
use util::io::SeekableMemWriter;
3029
use util::nodemap::{NodeMap, NodeSet};
3130

3231
use serialize::Encodable;
3332
use std::cell::RefCell;
3433
use std::gc::Gc;
3534
use std::hash::Hash;
3635
use std::hash;
36+
use std::io::MemWriter;
3737
use std::mem;
3838
use std::collections::HashMap;
3939
use syntax::abi;
@@ -61,7 +61,7 @@ pub enum InlinedItemRef<'a> {
6161
IIForeignRef(&'a ast::ForeignItem)
6262
}
6363

64-
pub type Encoder<'a> = writer::Encoder<'a, SeekableMemWriter>;
64+
pub type Encoder<'a> = writer::Encoder<'a, MemWriter>;
6565

6666
pub type EncodeInlinedItem<'a> = |ecx: &EncodeContext,
6767
ebml_w: &mut Encoder,
@@ -1407,7 +1407,7 @@ fn encode_info_for_items(ecx: &EncodeContext,
14071407
// Path and definition ID indexing
14081408

14091409
fn encode_index<T: Hash>(ebml_w: &mut Encoder, index: Vec<entry<T>>,
1410-
write_fn: |&mut SeekableMemWriter, &T|) {
1410+
write_fn: |&mut MemWriter, &T|) {
14111411
let mut buckets: Vec<Vec<entry<T>>> = Vec::from_fn(256, |_| Vec::new());
14121412
for elt in index.move_iter() {
14131413
let h = hash::hash(&elt.val) as uint;
@@ -1424,7 +1424,7 @@ fn encode_index<T: Hash>(ebml_w: &mut Encoder, index: Vec<entry<T>>,
14241424
ebml_w.start_tag(tag_index_buckets_bucket_elt);
14251425
assert!(elt.pos < 0xffff_ffff);
14261426
{
1427-
let wr: &mut SeekableMemWriter = ebml_w.writer;
1427+
let wr: &mut MemWriter = ebml_w.writer;
14281428
wr.write_be_u32(elt.pos as u32);
14291429
}
14301430
write_fn(ebml_w.writer, &elt.val);
@@ -1436,15 +1436,15 @@ fn encode_index<T: Hash>(ebml_w: &mut Encoder, index: Vec<entry<T>>,
14361436
ebml_w.start_tag(tag_index_table);
14371437
for pos in bucket_locs.iter() {
14381438
assert!(*pos < 0xffff_ffff);
1439-
let wr: &mut SeekableMemWriter = ebml_w.writer;
1439+
let wr: &mut MemWriter = ebml_w.writer;
14401440
wr.write_be_u32(*pos as u32);
14411441
}
14421442
ebml_w.end_tag();
14431443
ebml_w.end_tag();
14441444
}
14451445

1446-
fn write_i64(writer: &mut SeekableMemWriter, &n: &i64) {
1447-
let wr: &mut SeekableMemWriter = writer;
1446+
fn write_i64(writer: &mut MemWriter, &n: &i64) {
1447+
let wr: &mut MemWriter = writer;
14481448
assert!(n < 0x7fff_ffff);
14491449
wr.write_be_u32(n as u32);
14501450
}
@@ -1545,14 +1545,14 @@ fn encode_lang_items(ecx: &EncodeContext, ebml_w: &mut Encoder) {
15451545

15461546
ebml_w.start_tag(tag_lang_items_item_id);
15471547
{
1548-
let wr: &mut SeekableMemWriter = ebml_w.writer;
1548+
let wr: &mut MemWriter = ebml_w.writer;
15491549
wr.write_be_u32(i as u32);
15501550
}
15511551
ebml_w.end_tag(); // tag_lang_items_item_id
15521552

15531553
ebml_w.start_tag(tag_lang_items_item_node_id);
15541554
{
1555-
let wr: &mut SeekableMemWriter = ebml_w.writer;
1555+
let wr: &mut MemWriter = ebml_w.writer;
15561556
wr.write_be_u32(id.node as u32);
15571557
}
15581558
ebml_w.end_tag(); // tag_lang_items_item_node_id
@@ -1824,12 +1824,12 @@ pub static metadata_encoding_version : &'static [u8] =
18241824
0, 0, 0, 1 ];
18251825

18261826
pub fn encode_metadata(parms: EncodeParams, krate: &Crate) -> Vec<u8> {
1827-
let mut wr = SeekableMemWriter::new();
1827+
let mut wr = MemWriter::new();
18281828
encode_metadata_inner(&mut wr, parms, krate);
18291829
wr.unwrap().move_iter().collect()
18301830
}
18311831

1832-
fn encode_metadata_inner(wr: &mut SeekableMemWriter, parms: EncodeParams, krate: &Crate) {
1832+
fn encode_metadata_inner(wr: &mut MemWriter, parms: EncodeParams, krate: &Crate) {
18331833
struct Stats {
18341834
attr_bytes: u64,
18351835
dep_bytes: u64,
@@ -1982,7 +1982,7 @@ fn encode_metadata_inner(wr: &mut SeekableMemWriter, parms: EncodeParams, krate:
19821982

19831983
// Get the encoded string for a type
19841984
pub fn encoded_ty(tcx: &ty::ctxt, t: ty::t) -> String {
1985-
let mut wr = SeekableMemWriter::new();
1985+
let mut wr = MemWriter::new();
19861986
tyencode::enc_ty(&mut wr, &tyencode::ctxt {
19871987
diag: tcx.sess.diagnostic(),
19881988
ds: def_to_string,

‎branches/snap-stage3/src/librustc/metadata/tyencode.rs

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
use std::cell::RefCell;
1717
use std::collections::HashMap;
18+
use std::io::MemWriter;
1819

1920
use middle::subst;
2021
use middle::subst::VecPerParamSpace;
@@ -27,8 +28,6 @@ use syntax::ast::*;
2728
use syntax::diagnostic::SpanHandler;
2829
use syntax::parse::token;
2930

30-
use util::io::SeekableMemWriter;
31-
3231
macro_rules! mywrite( ($($arg:tt)*) => ({ write!($($arg)*); }) )
3332

3433
pub struct ctxt<'a> {
@@ -49,7 +48,7 @@ pub struct ty_abbrev {
4948

5049
pub type abbrev_map = RefCell<HashMap<ty::t, ty_abbrev>>;
5150

52-
pub fn enc_ty(w: &mut SeekableMemWriter, cx: &ctxt, t: ty::t) {
51+
pub fn enc_ty(w: &mut MemWriter, cx: &ctxt, t: ty::t) {
5352
match cx.abbrevs.borrow_mut().find(&t) {
5453
Some(a) => { w.write(a.s.as_bytes()); return; }
5554
None => {}
@@ -73,19 +72,19 @@ pub fn enc_ty(w: &mut SeekableMemWriter, cx: &ctxt, t: ty::t) {
7372
}
7473
}
7574

76-
fn enc_mutability(w: &mut SeekableMemWriter, mt: ast::Mutability) {
75+
fn enc_mutability(w: &mut MemWriter, mt: ast::Mutability) {
7776
match mt {
7877
MutImmutable => (),
7978
MutMutable => mywrite!(w, "m"),
8079
}
8180
}
8281

83-
fn enc_mt(w: &mut SeekableMemWriter, cx: &ctxt, mt: ty::mt) {
82+
fn enc_mt(w: &mut MemWriter, cx: &ctxt, mt: ty::mt) {
8483
enc_mutability(w, mt.mutbl);
8584
enc_ty(w, cx, mt.ty);
8685
}
8786

88-
fn enc_opt<T>(w: &mut SeekableMemWriter, t: Option<T>, enc_f: |&mut SeekableMemWriter, T|) {
87+
fn enc_opt<T>(w: &mut MemWriter, t: Option<T>, enc_f: |&mut MemWriter, T|) {
8988
match t {
9089
None => mywrite!(w, "n"),
9190
Some(v) => {
@@ -95,10 +94,10 @@ fn enc_opt<T>(w: &mut SeekableMemWriter, t: Option<T>, enc_f: |&mut SeekableMemW
9594
}
9695
}
9796

98-
fn enc_vec_per_param_space<T>(w: &mut SeekableMemWriter,
97+
fn enc_vec_per_param_space<T>(w: &mut MemWriter,
9998
cx: &ctxt,
10099
v: &VecPerParamSpace<T>,
101-
op: |&mut SeekableMemWriter, &ctxt, &T|) {
100+
op: |&mut MemWriter, &ctxt, &T|) {
102101
for &space in subst::ParamSpace::all().iter() {
103102
mywrite!(w, "[");
104103
for t in v.get_slice(space).iter() {
@@ -108,13 +107,13 @@ fn enc_vec_per_param_space<T>(w: &mut SeekableMemWriter,
108107
}
109108
}
110109

111-
pub fn enc_substs(w: &mut SeekableMemWriter, cx: &ctxt, substs: &subst::Substs) {
110+
pub fn enc_substs(w: &mut MemWriter, cx: &ctxt, substs: &subst::Substs) {
112111
enc_region_substs(w, cx, &substs.regions);
113112
enc_vec_per_param_space(w, cx, &substs.types,
114113
|w, cx, &ty| enc_ty(w, cx, ty));
115114
}
116115

117-
fn enc_region_substs(w: &mut SeekableMemWriter, cx: &ctxt, substs: &subst::RegionSubsts) {
116+
fn enc_region_substs(w: &mut MemWriter, cx: &ctxt, substs: &subst::RegionSubsts) {
118117
match *substs {
119118
subst::ErasedRegions => {
120119
mywrite!(w, "e");
@@ -127,7 +126,7 @@ fn enc_region_substs(w: &mut SeekableMemWriter, cx: &ctxt, substs: &subst::Regio
127126
}
128127
}
129128

130-
fn enc_region(w: &mut SeekableMemWriter, cx: &ctxt, r: ty::Region) {
129+
fn enc_region(w: &mut MemWriter, cx: &ctxt, r: ty::Region) {
131130
match r {
132131
ty::ReLateBound(id, br) => {
133132
mywrite!(w, "b[{}|", id);
@@ -162,7 +161,7 @@ fn enc_region(w: &mut SeekableMemWriter, cx: &ctxt, r: ty::Region) {
162161
}
163162
}
164163

165-
fn enc_bound_region(w: &mut SeekableMemWriter, cx: &ctxt, br: ty::BoundRegion) {
164+
fn enc_bound_region(w: &mut MemWriter, cx: &ctxt, br: ty::BoundRegion) {
166165
match br {
167166
ty::BrAnon(idx) => {
168167
mywrite!(w, "a{}|", idx);
@@ -178,12 +177,12 @@ fn enc_bound_region(w: &mut SeekableMemWriter, cx: &ctxt, br: ty::BoundRegion) {
178177
}
179178
}
180179

181-
pub fn enc_trait_ref(w: &mut SeekableMemWriter, cx: &ctxt, s: &ty::TraitRef) {
180+
pub fn enc_trait_ref(w: &mut MemWriter, cx: &ctxt, s: &ty::TraitRef) {
182181
mywrite!(w, "{}|", (cx.ds)(s.def_id));
183182
enc_substs(w, cx, &s.substs);
184183
}
185184

186-
pub fn enc_trait_store(w: &mut SeekableMemWriter, cx: &ctxt, s: ty::TraitStore) {
185+
pub fn enc_trait_store(w: &mut MemWriter, cx: &ctxt, s: ty::TraitStore) {
187186
match s {
188187
ty::UniqTraitStore => mywrite!(w, "~"),
189188
ty::RegionTraitStore(re, m) => {
@@ -194,7 +193,7 @@ pub fn enc_trait_store(w: &mut SeekableMemWriter, cx: &ctxt, s: ty::TraitStore)
194193
}
195194
}
196195

197-
fn enc_sty(w: &mut SeekableMemWriter, cx: &ctxt, st: &ty::sty) {
196+
fn enc_sty(w: &mut MemWriter, cx: &ctxt, st: &ty::sty) {
198197
match *st {
199198
ty::ty_nil => mywrite!(w, "n"),
200199
ty::ty_bot => mywrite!(w, "z"),
@@ -294,33 +293,33 @@ fn enc_sty(w: &mut SeekableMemWriter, cx: &ctxt, st: &ty::sty) {
294293
}
295294
}
296295

297-
fn enc_fn_style(w: &mut SeekableMemWriter, p: FnStyle) {
296+
fn enc_fn_style(w: &mut MemWriter, p: FnStyle) {
298297
match p {
299298
NormalFn => mywrite!(w, "n"),
300299
UnsafeFn => mywrite!(w, "u"),
301300
}
302301
}
303302

304-
fn enc_abi(w: &mut SeekableMemWriter, abi: Abi) {
303+
fn enc_abi(w: &mut MemWriter, abi: Abi) {
305304
mywrite!(w, "[");
306305
mywrite!(w, "{}", abi.name());
307306
mywrite!(w, "]")
308307
}
309308

310-
fn enc_onceness(w: &mut SeekableMemWriter, o: Onceness) {
309+
fn enc_onceness(w: &mut MemWriter, o: Onceness) {
311310
match o {
312311
Once => mywrite!(w, "o"),
313312
Many => mywrite!(w, "m")
314313
}
315314
}
316315

317-
pub fn enc_bare_fn_ty(w: &mut SeekableMemWriter, cx: &ctxt, ft: &ty::BareFnTy) {
316+
pub fn enc_bare_fn_ty(w: &mut MemWriter, cx: &ctxt, ft: &ty::BareFnTy) {
318317
enc_fn_style(w, ft.fn_style);
319318
enc_abi(w, ft.abi);
320319
enc_fn_sig(w, cx, &ft.sig);
321320
}
322321

323-
pub fn enc_closure_ty(w: &mut SeekableMemWriter, cx: &ctxt, ft: &ty::ClosureTy) {
322+
pub fn enc_closure_ty(w: &mut MemWriter, cx: &ctxt, ft: &ty::ClosureTy) {
324323
enc_fn_style(w, ft.fn_style);
325324
enc_onceness(w, ft.onceness);
326325
enc_trait_store(w, cx, ft.store);
@@ -331,7 +330,7 @@ pub fn enc_closure_ty(w: &mut SeekableMemWriter, cx: &ctxt, ft: &ty::ClosureTy)
331330
enc_abi(w, ft.abi);
332331
}
333332

334-
fn enc_fn_sig(w: &mut SeekableMemWriter, cx: &ctxt, fsig: &ty::FnSig) {
333+
fn enc_fn_sig(w: &mut MemWriter, cx: &ctxt, fsig: &ty::FnSig) {
335334
mywrite!(w, "[{}|", fsig.binder_id);
336335
for ty in fsig.inputs.iter() {
337336
enc_ty(w, cx, *ty);
@@ -345,7 +344,7 @@ fn enc_fn_sig(w: &mut SeekableMemWriter, cx: &ctxt, fsig: &ty::FnSig) {
345344
enc_ty(w, cx, fsig.output);
346345
}
347346

348-
fn enc_bounds(w: &mut SeekableMemWriter, cx: &ctxt, bs: &ty::ParamBounds) {
347+
fn enc_bounds(w: &mut MemWriter, cx: &ctxt, bs: &ty::ParamBounds) {
349348
for bound in bs.builtin_bounds.iter() {
350349
match bound {
351350
ty::BoundSend => mywrite!(w, "S"),
@@ -364,7 +363,7 @@ fn enc_bounds(w: &mut SeekableMemWriter, cx: &ctxt, bs: &ty::ParamBounds) {
364363
mywrite!(w, ".");
365364
}
366365

367-
pub fn enc_type_param_def(w: &mut SeekableMemWriter, cx: &ctxt, v: &ty::TypeParameterDef) {
366+
pub fn enc_type_param_def(w: &mut MemWriter, cx: &ctxt, v: &ty::TypeParameterDef) {
368367
mywrite!(w, "{}:{}|{}|{}|",
369368
token::get_ident(v.ident), (cx.ds)(v.def_id),
370369
v.space.to_uint(), v.index);

‎branches/snap-stage3/src/librustc/middle/astencode.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ use middle::subst;
2828
use middle::subst::VecPerParamSpace;
2929
use middle::typeck::{MethodCall, MethodCallee, MethodOrigin};
3030
use middle::{ty, typeck};
31-
use util::io::SeekableMemWriter;
3231
use util::ppaux::ty_to_string;
3332

3433
use syntax::{ast, ast_map, ast_util, codemap, fold};
@@ -40,6 +39,7 @@ use syntax;
4039

4140
use libc;
4241
use std::io::Seek;
42+
use std::io::MemWriter;
4343
use std::mem;
4444
use std::gc::GC;
4545

@@ -73,7 +73,7 @@ trait tr_intern {
7373
fn tr_intern(&self, xcx: &ExtendedDecodeContext) -> ast::DefId;
7474
}
7575

76-
pub type Encoder<'a> = writer::Encoder<'a, SeekableMemWriter>;
76+
pub type Encoder<'a> = writer::Encoder<'a, MemWriter>;
7777

7878
// ______________________________________________________________________
7979
// Top-level methods.
@@ -1573,8 +1573,10 @@ fn mk_ctxt() -> parse::ParseSess {
15731573

15741574
#[cfg(test)]
15751575
fn roundtrip(in_item: Option<Gc<ast::Item>>) {
1576+
use std::io::MemWriter;
1577+
15761578
let in_item = in_item.unwrap();
1577-
let mut wr = SeekableMemWriter::new();
1579+
let mut wr = MemWriter::new();
15781580
{
15791581
let mut ebml_w = writer::Encoder::new(&mut wr);
15801582
encode_item_ast(&mut ebml_w, in_item);

0 commit comments

Comments
 (0)