---

yaml
---
r: 227822
b: refs/heads/try
c: 32b7b50
h: refs/heads/master
v: v3

Author: SimonSapin

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 124d1657cc2e321a66e78e9bc5fd4e966f46da42
+refs/heads/try: 32b7b50bafd0d40fda1caa93cf7f7068cc5052e3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/etc/unicode.py

@@ -372,13 +372,6 @@ def emit_conversions_module(f, to_upper, to_lower, to_title):
         }
     }
 
-    pub fn to_title(c: char) -> [char; 3] {
-        match bsearch_case_table(c, to_titlecase_table) {
-            None        => [c, '\\0', '\\0'],
-            Some(index) => to_titlecase_table[index].1
-        }
-    }
-
     fn bsearch_case_table(c: char, table: &'static [(char, [char; 3])]) -> Option<usize> {
         match table.binary_search_by(|&(key, _)| {
             if c == key { Equal }
@@ -400,9 +393,6 @@ def emit_conversions_module(f, to_upper, to_lower, to_title):
     emit_table(f, "to_uppercase_table",
         sorted(to_upper.iteritems(), key=operator.itemgetter(0)),
         is_pub=False, t_type = t_type, pfun=pfun)
-    emit_table(f, "to_titlecase_table",
-        sorted(to_title.iteritems(), key=operator.itemgetter(0)),
-        is_pub=False, t_type = t_type, pfun=pfun)
     f.write("}\n\n")
 
 def emit_grapheme_module(f, grapheme_table, grapheme_cats):

branches/try/src/libcollections/vec.rs

@@ -1482,7 +1482,7 @@ impl<T> FromIterator<T> for Vec<T> {
             None => return Vec::new(),
             Some(element) => {
                 let (lower, _) = iterator.size_hint();
-                let mut vector = Vec::with_capacity(lower.saturating_add(1));
+                let mut vector = Vec::with_capacity(1 + lower);
                 unsafe {
                     ptr::write(vector.get_unchecked_mut(0), element);
                     vector.set_len(1);
@@ -1570,11 +1570,10 @@ impl<T> Vec<T> {
             let len = self.len();
             if len == self.capacity() {
                 let (lower, _) = iterator.size_hint();
-                self.reserve(lower.saturating_add(1));
+                self.reserve(lower + 1);
             }
             unsafe {
                 ptr::write(self.get_unchecked_mut(len), element);
-                // NB can't overflow since we would have had to alloc the address space
                 self.set_len(len + 1);
             }
         }

branches/try/src/libcoretest/char.rs

@@ -102,29 +102,6 @@ fn test_to_uppercase() {
     assert_eq!(upper('ᾀ'), ['Ἀ', 'Ι']);
 }
 
-#[test]
-fn test_to_titlecase() {
-    fn title(c: char) -> Vec<char> {
-        c.to_titlecase().collect()
-    }
-    assert_eq!(title('a'), ['A']);
-    assert_eq!(title('ö'), ['Ö']);
-    assert_eq!(title('ß'), ['S', 's']); // not ẞ: Latin capital letter sharp s
-    assert_eq!(title('ü'), ['Ü']);
-    assert_eq!(title('💩'), ['💩']);
-
-    assert_eq!(title('σ'), ['Σ']);
-    assert_eq!(title('τ'), ['Τ']);
-    assert_eq!(title('ι'), ['Ι']);
-    assert_eq!(title('γ'), ['Γ']);
-    assert_eq!(title('μ'), ['Μ']);
-    assert_eq!(title('α'), ['Α']);
-    assert_eq!(title('ς'), ['Σ']);
-    assert_eq!(title('DŽ'), ['Dž']);
-    assert_eq!(title('fi'), ['F', 'i']);
-    assert_eq!(title('ᾀ'), ['ᾈ']);
-}
-
 #[test]
 fn test_is_control() {
     assert!('\u{0}'.is_control());

branches/try/src/librustc_unicode/char.rs

@@ -67,18 +67,6 @@ impl Iterator for ToUppercase {
     fn next(&mut self) -> Option<char> { self.0.next() }
 }
 
-/// An iterator over the titlecase mapping of a given character, returned from
-/// the [`to_titlecase` method](../primitive.char.html#method.to_titlecase) on
-/// characters.
-#[unstable(feature = "unicode", reason = "recently added")]
-pub struct ToTitlecase(CaseMappingIter);
-
-#[stable(feature = "unicode_case_mapping", since = "1.2.0")]
-impl Iterator for ToTitlecase {
-    type Item = char;
-    fn next(&mut self) -> Option<char> { self.0.next() }
-}
-
 
 enum CaseMappingIter {
     Three(char, char, char),
@@ -477,27 +465,6 @@ impl char {
         ToLowercase(CaseMappingIter::new(conversions::to_lower(self)))
     }
 
-    /// Converts a character to its titlecase equivalent.
-    ///
-    /// This performs complex unconditional mappings with no tailoring.
-    /// See `to_uppercase()` for references and more information.
-    ///
-    /// This differs from `to_uppercase()` since Unicode contains
-    /// digraphs and ligature characters.
-    /// For example, U+01F3 “dz” and U+FB01 “fi”
-    /// map to U+01F1 “DZ” and U+0046 U+0069 “Fi”, respectively.
-    ///
-    /// # Return value
-    ///
-    /// Returns an iterator which yields the characters corresponding to the
-    /// titlecase equivalent of the character. If no conversion is possible then
-    /// an iterator with just the input character is returned.
-    #[unstable(feature = "unicode", reason = "recently added")]
-    #[inline]
-    pub fn to_titlecase(self) -> ToTitlecase {
-        ToTitlecase(CaseMappingIter::new(conversions::to_title(self)))
-    }
-
     /// Converts a character to its uppercase equivalent.
     ///
     /// This performs complex unconditional mappings with no tailoring: