Skip to content

Commit 2805a6f

Browse files
committed
---
yaml --- r: 11245 b: refs/heads/master c: 4d788be h: refs/heads/master i: 11243: 711ed68 v: v3
1 parent 8af80ae commit 2805a6f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 8d29e8705626e28d3bf96d194dd97311e1967995
2+
refs/heads/master: 4d788be80d98c792111f65605bb8853ab3cbdd4a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/str.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Function: from_cstr
194194
195195
Create a Rust string from a null-terminated C string
196196
*/
197-
unsafe fn from_cstr(cstr: sbuf) -> str {
197+
fn from_cstr(cstr: sbuf) -> str unsafe {
198198
let start = cstr;
199199
let curr = start;
200200
let i = 0u;
@@ -210,7 +210,7 @@ Function: from_cstr_len
210210
211211
Create a Rust string from a C string of the given length
212212
*/
213-
unsafe fn from_cstr_len(cstr: sbuf, len: uint) -> str {
213+
fn from_cstr_len(cstr: sbuf, len: uint) -> str unsafe {
214214
let buf: [u8] = [];
215215
vec::reserve(buf, len + 1u);
216216
vec::as_buf(buf) {|b| ptr::memcpy(b, cstr, len); }

0 commit comments

Comments
 (0)