Skip to content

Commit d9d50b4

Browse files
committed
---
yaml --- r: 2439 b: refs/heads/master c: 813636d h: refs/heads/master i: 2437: 8a30d23 2435: 8cffddd 2431: 7cafa35 v: v3
1 parent ed85de4 commit d9d50b4

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 17daf1f9bf4e78c9f3ed8be24ef4bc15d60c744e
2+
refs/heads/master: 813636d52e1d77785e4ec28c0fd5e5f513d2e020

trunk/src/lib/IO.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ fn string_writer() -> str_writer {
492492
let mutable_byte_buf buf = @rec(mutable buf = b, mutable pos = 0u);
493493
state obj str_writer_wrap(writer wr, mutable_byte_buf buf) {
494494
fn get_writer() -> writer {ret wr;}
495-
fn get_str() -> str {ret Str.unsafe_from_mutable_bytes(buf.buf);}
495+
fn get_str() -> str {ret Str.unsafe_from_bytes(buf.buf);}
496496
}
497497
ret str_writer_wrap(new_writer(byte_buf_writer(buf)), buf);
498498
}

trunk/src/lib/Str.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,6 @@ fn unsafe_from_bytes(vec[mutable? u8] v) -> str {
139139
ret rustrt.str_from_vec(v);
140140
}
141141

142-
// FIXME even temp-er thing; rustc can use "unsafe_from_bytes" above
143-
fn unsafe_from_mutable_bytes(vec[mutable u8] mv) -> str {
144-
let vec[u8] v = vec();
145-
for (u8 b in mv) {
146-
v += vec(b);
147-
}
148-
ret rustrt.str_from_vec(v);
149-
}
150-
151142
fn unsafe_from_byte(u8 u) -> str {
152143
ret rustrt.str_from_vec(vec(u));
153144
}

0 commit comments

Comments
 (0)