diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-05 06:57:18 -0500 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-05 06:57:18 -0500 |
commit | d768ee5d4c2ef0429e88191f01f977338c964359 (patch) | |
tree | 32cfbe0f5b4bc8410679901986f69acc66d27935 /components/util/str.rs | |
parent | 573c0a74684dc0043da4800a84065d72453641fd (diff) | |
parent | db5ddb561cb821ac89c8cc1002cdbddfd98400fa (diff) | |
download | servo-d768ee5d4c2ef0429e88191f01f977338c964359.tar.gz servo-d768ee5d4c2ef0429e88191f01f977338c964359.zip |
Auto merge of #11619 - Ms2ger:freetype, r=nox
Some cleanup in gfx.
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11619)
<!-- Reviewable:end -->
Diffstat (limited to 'components/util/str.rs')
-rw-r--r-- | components/util/str.rs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/components/util/str.rs b/components/util/str.rs index 7af63f4c7f3..7df67e1b421 100644 --- a/components/util/str.rs +++ b/components/util/str.rs @@ -3,14 +3,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use app_units::Au; -use libc::c_char; use num_traits::ToPrimitive; -use std::borrow::ToOwned; use std::convert::AsRef; -use std::ffi::CStr; use std::iter::{Filter, Peekable}; use std::ops::Deref; -use std::str::{Split, from_utf8}; +use std::str::Split; pub type StaticCharVec = &'static [char]; pub type StaticStringVec = &'static [&'static str]; @@ -150,12 +147,6 @@ impl Deref for LowercaseString { } } -/// Creates a String from the given null-terminated buffer. -/// Panics if the buffer does not contain UTF-8. -pub unsafe fn c_str_to_string(s: *const c_char) -> String { - from_utf8(CStr::from_ptr(s).to_bytes()).unwrap().to_owned() -} - pub fn str_join<I, T>(strs: I, join: &str) -> String where I: IntoIterator<Item=T>, T: AsRef<str>, { |