diff options
| author | Adolfo Ochagavía <aochagavia92@gmail.com> | 2014-06-30 16:41:30 +0200 |
|---|---|---|
| committer | Adolfo Ochagavía <aochagavia92@gmail.com> | 2014-07-15 19:55:17 +0200 |
| commit | 211f1caa290d83a3e24ad99d53395975a3981014 (patch) | |
| tree | 717e8a9d5debccefacc275fdd28f6a292a5737be /src/libterm | |
| parent | 1704ebb798bd55a782b80ae6741c5d11403aaf13 (diff) | |
| download | rust-211f1caa290d83a3e24ad99d53395975a3981014.tar.gz rust-211f1caa290d83a3e24ad99d53395975a3981014.zip | |
Deprecate `str::from_utf8_owned`
Use `String::from_utf8` instead [breaking-change]
Diffstat (limited to 'src/libterm')
| -rw-r--r-- | src/libterm/terminfo/parser/compiled.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs index 9467eb69921..09fe2ef29ef 100644 --- a/src/libterm/terminfo/parser/compiled.rs +++ b/src/libterm/terminfo/parser/compiled.rs @@ -214,9 +214,9 @@ pub fn parse(file: &mut io::Reader, longnames: bool) // don't read NUL let bytes = try!(file.read_exact(names_bytes as uint - 1)); - let names_str = match str::from_utf8(bytes.as_slice()) { - Some(s) => s.to_string(), - None => return Err("input not utf-8".to_string()), + let names_str = match String::from_utf8(bytes) { + Ok(s) => s, + Err(_) => return Err("input not utf-8".to_string()), }; let term_names: Vec<String> = names_str.as_slice() |