servo: Merge #18693 - Upgrade to rustc 1.22.0-nightly (c6884b12d 2017-09-30) (from servo:rustup); r=nox
authorSimon Sapin <simon.sapin@exyr.org>
Sun, 01 Oct 2017 09:46:05 -0500
changeset 426523 44a60b3064559713cec01fcb7804a2ebb72b6a04
parent 426522 b5cf95178314a50d6ee2790cc55fb660708a3e02
child 426524 67d77477c96a1fc5757abd63c4c7e7446cc8b4bd
push id97
push userfmarier@mozilla.com
push dateSat, 14 Oct 2017 01:12:59 +0000
reviewersnox
milestone58.0a1
servo: Merge #18693 - Upgrade to rustc 1.22.0-nightly (c6884b12d 2017-09-30) (from servo:rustup); r=nox A new `AddAssign` impl in the standard library made inference ambiguous. Source-Repo: https://github.com/servo/servo Source-Revision: a2403c5cd63d689283bc35ff9c11329a7b522caf
servo/components/script/textinput.rs
servo/rust-toolchain
--- a/servo/components/script/textinput.rs
+++ b/servo/components/script/textinput.rs
@@ -231,17 +231,17 @@ impl<T: ClipboardProvider> TextInput<T> 
             return None
         }
         Some(text)
     }
 
     /// The length of the selected text in UTF-16 code units.
     fn selection_utf16_len(&self) -> usize {
         self.fold_selection_slices(0usize,
-            |len, slice| *len += slice.chars().map(char::len_utf16).sum())
+            |len, slice| *len += slice.chars().map(char::len_utf16).sum::<usize>())
     }
 
     /// Run the callback on a series of slices that, concatenated, make up the selected text.
     ///
     /// The accumulator `acc` can be mutated by the callback, and will be returned at the end.
     fn fold_selection_slices<B, F: FnMut(&mut B, &str)>(&self, mut acc: B, mut f: F) -> B {
         match self.get_sorted_selection() {
             Some((begin, end)) if begin.line == end.line => {
--- a/servo/rust-toolchain
+++ b/servo/rust-toolchain
@@ -1,1 +1,1 @@
-nightly-2017-09-17
+nightly-2017-10-01