Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18693 - servo:rustup, r=nox

Browse source 
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 -->
This commit is contained in:
bors-servo 2017-10-01 09:46:05 -05:00 • committed by GitHub
commit a2403c5cd6
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/textinput.rs
View file

@ -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.

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2017-09-17
nightly-2017-10-01