diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-10-01 09:46:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-01 09:46:05 -0500 |
| commit | a2403c5cd63d689283bc35ff9c11329a7b522caf (patch) | |
| tree | b2ab2a3e5cce8ed74e657f7b5da81afa0915682c | |
| parent | 65d9b345bb2a588f41b0d6cdca1aaca2c3c69205 (diff) | |
| parent | b6bfdc982ddc65866787211b393d96fa3d5ba38e (diff) | |
| download | servo-a2403c5cd63d689283bc35ff9c11329a7b522caf.tar.gz servo-a2403c5cd63d689283bc35ff9c11329a7b522caf.zip | |
Auto merge of #18693 - servo:rustup, r=nox
Upgrade to rustc 1.22.0-nightly (c6884b12d 2017-09-30)
A new `AddAssign` impl in the standard library made inference ambiguous.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18693)
<!-- Reviewable:end -->
| -rw-r--r-- | components/script/textinput.rs | 2 | ||||
| -rw-r--r-- | 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 |