Skip to content

Commit bcf0e28

Browse files
committed
---
yaml --- r: 42836 b: refs/heads/try c: 13076eb h: refs/heads/master v: v3
1 parent 030dd7f commit bcf0e28

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
5-
refs/heads/try: dafd759b2063d89f03ab72f931f1da2f03a927fb
5+
refs/heads/try: 13076eb3b0223ef5bb4a5d7ba12a3a4faa0de34a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libsyntax/attr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,9 @@ pub fn sort_meta_items(+items: ~[@ast::meta_item]) -> ~[@ast::meta_item] {
269269
}
270270

271271
// This is sort of stupid here, converting to a vec of mutables and back
272-
let mut v: ~[@ast::meta_item] = vec::cast_to_mut(items);
272+
let mut v: ~[@ast::meta_item] = items;
273273
std::sort::quick_sort(v, lteq);
274-
vec::cast_from_mut(move v)
274+
move v
275275
}
276276

277277
pub fn remove_meta_items_by_name(items: ~[@ast::meta_item], name: ~str) ->

branches/try/src/libsyntax/print/pp.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,17 @@ pub fn mk_printer(out: io::Writer, linewidth: uint) -> printer {
148148
// fall behind.
149149
let n: uint = 3 * linewidth;
150150
debug!("mk_printer %u", linewidth);
151-
let mut token: ~[token] = vec::cast_to_mut(vec::from_elem(n, EOF));
152-
let mut size: ~[int] = vec::cast_to_mut(vec::from_elem(n, 0));
153-
let mut scan_stack: ~[uint] = vec::cast_to_mut(vec::from_elem(n, 0u));
151+
let mut token: ~[token] = vec::from_elem(n, EOF);
152+
let mut size: ~[int] = vec::from_elem(n, 0);
153+
let mut scan_stack: ~[uint] = vec::from_elem(n, 0u);
154154
printer_(@{out: out,
155155
buf_len: n,
156156
mut margin: linewidth as int,
157157
mut space: linewidth as int,
158158
mut left: 0,
159159
mut right: 0,
160-
token: move token,
161-
size: move size,
160+
mut token: move token,
161+
mut size: move size,
162162
mut left_total: 0,
163163
mut right_total: 0,
164164
mut scan_stack: move scan_stack,

0 commit comments

Comments
 (0)