Skip to content

Commit b30a524

Browse files
committed
---
yaml --- r: 15335 b: refs/heads/try c: b91c9f8 h: refs/heads/master i: 15333: 6949e72 15331: e622a41 15327: 2962ee9 v: v3
1 parent 2a47865 commit b30a524

File tree

7 files changed

+517
-16
lines changed

7 files changed

+517
-16
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 79cbdba03760347393778607be2127763829a570
5+
refs/heads/try: b91c9f803d3b87be3c6b7480ef9abbd9611c717c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/os.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ mod tests {
849849
};
850850
assert (ostream as uint != 0u);
851851
let s = "hello";
852-
let mut buf = str::bytes(s) + [0 as u8];
852+
let mut buf = vec::to_mut(str::bytes(s) + [0 as u8]);
853853
vec::as_mut_buf(buf) {|b|
854854
assert (libc::fwrite(b as *c_void, 1u, str::len(s) + 1u, ostream) ==
855855
buf.len())};

branches/try/src/libcore/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,7 @@ mod unsafe {
16581658
Does not verify that the vector contains valid UTF-8.
16591659
"]
16601660
unsafe fn from_bytes(v: [const u8]) -> str unsafe {
1661-
let mut vcopy: [u8] = v + [0u8];
1661+
let vcopy = v + [0u8];
16621662
let scopy: str = ::unsafe::reinterpret_cast(vcopy);
16631663
::unsafe::forget(vcopy);
16641664
ret scopy;

0 commit comments

Comments
 (0)