Skip to content

Commit 3c4391d

Browse files
borsbors
committed
---
yaml --- r: 234899 b: refs/heads/stable c: cfb7778 h: refs/heads/master i: 234897: e31f749 234895: c6698c5 v: v3
1 parent 9363c38 commit 3c4391d

File tree

15 files changed

+127
-592
lines changed

15 files changed

+127
-592
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 165a2817a413fd08eb7feeae145554d219f20552
32+
refs/heads/stable: cfb77788ce2a38b90162113611262dc0ed0af1b9
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

‎branches/stable/configure

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,18 @@ then
899899
fi
900900
fi
901901

902+
# If the clang isn't already enabled, check for GCC, and if it is missing, turn
903+
# on clang as a backup.
904+
if [ -z "$CFG_ENABLE_CLANG" ]
905+
then
906+
CFG_GCC_VERSION=$("$CFG_GCC" --version 2>&1)
907+
if [ $? -ne 0 ]
908+
then
909+
step_msg "GCC not installed, will try using Clang"
910+
CFG_ENABLE_CLANG=1
911+
fi
912+
fi
913+
902914
# Okay, at this point, we have made up our minds about whether we are
903915
# going to force CFG_ENABLE_CLANG or not; save the setting if so.
904916
if [ ! -z "$CFG_ENABLE_CLANG" ]

‎branches/stable/src/etc/unicode.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -372,13 +372,6 @@ def emit_conversions_module(f, to_upper, to_lower, to_title):
372372
}
373373
}
374374
375-
pub fn to_title(c: char) -> [char; 3] {
376-
match bsearch_case_table(c, to_titlecase_table) {
377-
None => [c, '\\0', '\\0'],
378-
Some(index) => to_titlecase_table[index].1
379-
}
380-
}
381-
382375
fn bsearch_case_table(c: char, table: &'static [(char, [char; 3])]) -> Option<usize> {
383376
match table.binary_search_by(|&(key, _)| {
384377
if c == key { Equal }
@@ -400,9 +393,6 @@ def emit_conversions_module(f, to_upper, to_lower, to_title):
400393
emit_table(f, "to_uppercase_table",
401394
sorted(to_upper.iteritems(), key=operator.itemgetter(0)),
402395
is_pub=False, t_type = t_type, pfun=pfun)
403-
emit_table(f, "to_titlecase_table",
404-
sorted(to_title.iteritems(), key=operator.itemgetter(0)),
405-
is_pub=False, t_type = t_type, pfun=pfun)
406396
f.write("}\n\n")
407397

408398
def emit_grapheme_module(f, grapheme_table, grapheme_cats):

‎branches/stable/src/libcollections/vec.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@ impl<T> FromIterator<T> for Vec<T> {
14821482
None => return Vec::new(),
14831483
Some(element) => {
14841484
let (lower, _) = iterator.size_hint();
1485-
let mut vector = Vec::with_capacity(1 + lower);
1485+
let mut vector = Vec::with_capacity(lower.saturating_add(1));
14861486
unsafe {
14871487
ptr::write(vector.get_unchecked_mut(0), element);
14881488
vector.set_len(1);
@@ -1570,10 +1570,11 @@ impl<T> Vec<T> {
15701570
let len = self.len();
15711571
if len == self.capacity() {
15721572
let (lower, _) = iterator.size_hint();
1573-
self.reserve(lower + 1);
1573+
self.reserve(lower.saturating_add(1));
15741574
}
15751575
unsafe {
15761576
ptr::write(self.get_unchecked_mut(len), element);
1577+
// NB can't overflow since we would have had to alloc the address space
15771578
self.set_len(len + 1);
15781579
}
15791580
}

‎branches/stable/src/libcollectionstest/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
#![feature(append)]
12-
#![feature(bit_vec_append_split_off)]
1312
#![feature(bitset)]
1413
#![feature(bitvec)]
1514
#![feature(box_syntax)]

‎branches/stable/src/libcoretest/char.rs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -102,29 +102,6 @@ fn test_to_uppercase() {
102102
assert_eq!(upper('ᾀ'), ['Ἀ', 'Ι']);
103103
}
104104

105-
#[test]
106-
fn test_to_titlecase() {
107-
fn title(c: char) -> Vec<char> {
108-
c.to_titlecase().collect()
109-
}
110-
assert_eq!(title('a'), ['A']);
111-
assert_eq!(title('ö'), ['Ö']);
112-
assert_eq!(title('ß'), ['S', 's']); // not ẞ: Latin capital letter sharp s
113-
assert_eq!(title('ü'), ['Ü']);
114-
assert_eq!(title('💩'), ['💩']);
115-
116-
assert_eq!(title('σ'), ['Σ']);
117-
assert_eq!(title('τ'), ['Τ']);
118-
assert_eq!(title('ι'), ['Ι']);
119-
assert_eq!(title('γ'), ['Γ']);
120-
assert_eq!(title('μ'), ['Μ']);
121-
assert_eq!(title('α'), ['Α']);
122-
assert_eq!(title('ς'), ['Σ']);
123-
assert_eq!(title('DŽ'), ['Dž']);
124-
assert_eq!(title('fi'), ['F', 'i']);
125-
assert_eq!(title('ᾀ'), ['ᾈ']);
126-
}
127-
128105
#[test]
129106
fn test_is_control() {
130107
assert!('\u{0}'.is_control());

‎branches/stable/src/liblibc/lib.rs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3600,6 +3600,11 @@ pub mod consts {
36003600
pub const SHUT_RD: c_int = 0;
36013601
pub const SHUT_WR: c_int = 1;
36023602
pub const SHUT_RDWR: c_int = 2;
3603+
3604+
pub const LOCK_SH: c_int = 1;
3605+
pub const LOCK_EX: c_int = 2;
3606+
pub const LOCK_NB: c_int = 4;
3607+
pub const LOCK_UN: c_int = 8;
36033608
}
36043609
#[cfg(any(target_arch = "mips",
36053610
target_arch = "mipsel"))]
@@ -3684,6 +3689,11 @@ pub mod consts {
36843689
pub const SHUT_RD: c_int = 0;
36853690
pub const SHUT_WR: c_int = 1;
36863691
pub const SHUT_RDWR: c_int = 2;
3692+
3693+
pub const LOCK_SH: c_int = 1;
3694+
pub const LOCK_EX: c_int = 2;
3695+
pub const LOCK_NB: c_int = 4;
3696+
pub const LOCK_UN: c_int = 8;
36873697
}
36883698
#[cfg(any(target_arch = "x86",
36893699
target_arch = "x86_64",
@@ -4227,6 +4237,11 @@ pub mod consts {
42274237
pub const SHUT_RD: c_int = 0;
42284238
pub const SHUT_WR: c_int = 1;
42294239
pub const SHUT_RDWR: c_int = 2;
4240+
4241+
pub const LOCK_SH: c_int = 1;
4242+
pub const LOCK_EX: c_int = 2;
4243+
pub const LOCK_NB: c_int = 4;
4244+
pub const LOCK_UN: c_int = 8;
42304245
}
42314246
pub mod extra {
42324247
use types::os::arch::c95::c_int;
@@ -4651,6 +4666,11 @@ pub mod consts {
46514666
pub const SHUT_RD: c_int = 0;
46524667
pub const SHUT_WR: c_int = 1;
46534668
pub const SHUT_RDWR: c_int = 2;
4669+
4670+
pub const LOCK_SH: c_int = 1;
4671+
pub const LOCK_EX: c_int = 2;
4672+
pub const LOCK_NB: c_int = 4;
4673+
pub const LOCK_UN: c_int = 8;
46544674
}
46554675
pub mod extra {
46564676
use types::os::arch::c95::c_int;
@@ -5092,6 +5112,11 @@ pub mod consts {
50925112
pub const SHUT_RD: c_int = 0;
50935113
pub const SHUT_WR: c_int = 1;
50945114
pub const SHUT_RDWR: c_int = 2;
5115+
5116+
pub const LOCK_SH: c_int = 1;
5117+
pub const LOCK_EX: c_int = 2;
5118+
pub const LOCK_NB: c_int = 4;
5119+
pub const LOCK_UN: c_int = 8;
50955120
}
50965121
pub mod extra {
50975122
use types::os::arch::c95::c_int;
@@ -6121,6 +6146,7 @@ pub mod funcs {
61216146
-> c_int;
61226147
pub fn realpath(pathname: *const c_char, resolved: *mut c_char)
61236148
-> *mut c_char;
6149+
pub fn flock(fd: c_int, operation: c_int) -> c_int;
61246150
}
61256151
}
61266152

@@ -6137,6 +6163,7 @@ pub mod funcs {
61376163
-> c_int;
61386164
pub fn mincore(addr: *mut c_void, len: size_t, vec: *mut c_uchar)
61396165
-> c_int;
6166+
pub fn flock(fd: c_int, operation: c_int) -> c_int;
61406167
}
61416168
}
61426169

‎branches/stable/src/librustc_borrowck/borrowck/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> {
734734
has type `{}`, which is {}",
735735
ol,
736736
moved_lp_msg,
737-
expr_ty,
737+
moved_lp.ty,
738738
suggestion));
739739
self.tcx.sess.fileline_help(expr_span, help);
740740
}

‎branches/stable/src/librustc_unicode/char.rs

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,6 @@ impl Iterator for ToUppercase {
6767
fn next(&mut self) -> Option<char> { self.0.next() }
6868
}
6969

70-
/// An iterator over the titlecase mapping of a given character, returned from
71-
/// the [`to_titlecase` method](../primitive.char.html#method.to_titlecase) on
72-
/// characters.
73-
#[unstable(feature = "unicode", reason = "recently added")]
74-
pub struct ToTitlecase(CaseMappingIter);
75-
76-
#[stable(feature = "unicode_case_mapping", since = "1.2.0")]
77-
impl Iterator for ToTitlecase {
78-
type Item = char;
79-
fn next(&mut self) -> Option<char> { self.0.next() }
80-
}
81-
8270

8371
enum CaseMappingIter {
8472
Three(char, char, char),
@@ -477,27 +465,6 @@ impl char {
477465
ToLowercase(CaseMappingIter::new(conversions::to_lower(self)))
478466
}
479467

480-
/// Converts a character to its titlecase equivalent.
481-
///
482-
/// This performs complex unconditional mappings with no tailoring.
483-
/// See `to_uppercase()` for references and more information.
484-
///
485-
/// This differs from `to_uppercase()` since Unicode contains
486-
/// digraphs and ligature characters.
487-
/// For example, U+01F3 “dz” and U+FB01 “fi”
488-
/// map to U+01F1 “DZ” and U+0046 U+0069 “Fi”, respectively.
489-
///
490-
/// # Return value
491-
///
492-
/// Returns an iterator which yields the characters corresponding to the
493-
/// titlecase equivalent of the character. If no conversion is possible then
494-
/// an iterator with just the input character is returned.
495-
#[unstable(feature = "unicode", reason = "recently added")]
496-
#[inline]
497-
pub fn to_titlecase(self) -> ToTitlecase {
498-
ToTitlecase(CaseMappingIter::new(conversions::to_title(self)))
499-
}
500-
501468
/// Converts a character to its uppercase equivalent.
502469
///
503470
/// This performs complex unconditional mappings with no tailoring:

0 commit comments

Comments
 (0)