about summary refs log tree commit diff
path: root/src/libserialize
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-04-18 07:09:22 +0000
committerbors <bors@rust-lang.org>2015-04-18 07:09:22 +0000
commit7a5754b330e78e2ab5a2682a16f53f4f9fe96ed7 (patch)
treec0927d6a5cb22ddf889674b6f7f0fbd978890b32 /src/libserialize
parent77213d1b28b307401d2bbb143168418bf7e6794c (diff)
parent29d1252e4d2126318d7f622505ed76dd1e8e4edc (diff)
downloadrust-7a5754b330e78e2ab5a2682a16f53f4f9fe96ed7.tar.gz
rust-7a5754b330e78e2ab5a2682a16f53f4f9fe96ed7.zip
Auto merge of #24428 - kwantam:deprecate_unicode_fns, r=alexcrichton
This patch
1. renames libunicode to librustc_unicode,
2. deprecates several pieces of libunicode (see below), and
3. removes references to deprecated functions from
   librustc_driver and libsyntax. This may change pretty-printed
   output from these modules in cases involving wide or combining
   characters used in filenames, identifiers, etc.

The following functions are marked deprecated:

1. char.width() and str.width():
   --> use unicode-width crate

2. str.graphemes() and str.grapheme_indices():
   --> use unicode-segmentation crate

3. str.nfd_chars(), str.nfkd_chars(), str.nfc_chars(), str.nfkc_chars(),
   char.compose(), char.decompose_canonical(), char.decompose_compatible(),
   char.canonical_combining_class():
   --> use unicode-normalization crate
Diffstat (limited to 'src/libserialize')
-rw-r--r--src/libserialize/json.rs4
-rw-r--r--src/libserialize/lib.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index b4f679a8109..4255899aa01 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -211,8 +211,8 @@ use std::str::FromStr;
 use std::string;
 use std::{char, f64, fmt, num, str};
 use std;
-use unicode::str as unicode_str;
-use unicode::str::Utf16Item;
+use rustc_unicode::str as unicode_str;
+use rustc_unicode::str::Utf16Item;
 
 use Encodable;
 
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index dde79b123e6..7f3633eb5bd 100644
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -41,7 +41,7 @@ Core encoding and decoding interfaces.
 #[cfg(test)] extern crate test;
 #[macro_use] extern crate log;
 
-extern crate unicode;
+extern crate rustc_unicode;
 extern crate collections;
 
 pub use self::serialize::{Decoder, Encoder, Decodable, Encodable,