Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

str::from_bytes is now str::from_utf8 #54

Merged
merged 1 commit into from Sep 6, 2013
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

str::from_bytes is now str::from_utf8

  • Loading branch information
brson committed Sep 6, 2013
commit 2079b5f8da888eca65ef0e61d0a9438c794f2d98
6 gl2.rs
@@ -15,7 +15,7 @@ use std::cast::transmute;
use std::cmp;
use std::ptr;
use std::ptr::to_unsafe_ptr;
use std::str::from_bytes;
use std::str::from_utf8;
use std::str::raw::from_c_str;
use std::sys::size_of;
use std::vec::from_elem;
@@ -780,7 +780,7 @@ pub fn get_program_info_log(program: GLuint) -> ~str {
to_unsafe_ptr(&result_len),
to_ptr(result) as *GLchar);
result.truncate(if result_len > 0 {result_len-1} else {0} as uint);
return from_bytes(result);
return from_utf8(result);
}
}

@@ -803,7 +803,7 @@ pub fn get_shader_info_log(shader: GLuint) -> ~str {
to_unsafe_ptr(&result_len),
to_ptr(result) as *GLchar);
result.truncate(if result_len > 0 {result_len-1} else {0} as uint);
return from_bytes(result);
return from_utf8(result);
}
}

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.