From b6bfdc982ddc65866787211b393d96fa3d5ba38e Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Sun, 1 Oct 2017 14:50:25 +0200
Subject: [PATCH] Upgrade to rustc 1.22.0-nightly (c6884b12d 2017-09-30)

A new `AddAssign` impl in the standard library made inference ambiguous.
---
 components/script/textinput.rs | 2 +-
 rust-toolchain                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/script/textinput.rs b/components/script/textinput.rs
index 0ac002b9b9f..92fd76706f2 100644
--- a/components/script/textinput.rs
+++ b/components/script/textinput.rs
@@ -236,7 +236,7 @@ impl<T: ClipboardProvider> TextInput<T> {
     /// 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.
diff --git a/rust-toolchain b/rust-toolchain
index 1ca562033e9..1b3072e1045 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2017-09-17
+nightly-2017-10-01