diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/layout/fragment.rs | 3 | ||||
| -rw-r--r-- | components/layout/lib.rs | 1 | ||||
| -rw-r--r-- | components/layout/text.rs | 6 | ||||
| -rw-r--r-- | components/net/cookie_storage.rs | 2 | ||||
| -rw-r--r-- | components/net/lib.rs | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 9523159de41..4dda58364aa 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -2021,8 +2021,7 @@ impl Fragment { return false } - let length = first_unscanned_text.text.len(); - if length != 0 && first_unscanned_text.text.char_at_reverse(length) == '\n' { + if first_unscanned_text.text.ends_with('\n') { return false } diff --git a/components/layout/lib.rs b/components/layout/lib.rs index 22dc6546629..88f08610eba 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -11,7 +11,6 @@ #![feature(plugin)] #![feature(raw)] #![feature(step_by)] -#![feature(str_char)] #![feature(unsafe_no_drop_flag)] #![deny(unsafe_code)] diff --git a/components/layout/text.rs b/components/layout/text.rs index b7729608ce7..2ee93282822 100644 --- a/components/layout/text.rs +++ b/components/layout/text.rs @@ -339,15 +339,15 @@ impl TextRunScanner { break; } }; - let mut mapping = mappings.next().unwrap(); + let mapping = mappings.next().unwrap(); let scanned_run = runs[mapping.text_run_index].clone(); let mut byte_range = Range::new(ByteIndex(mapping.byte_range.begin() as isize), ByteIndex(mapping.byte_range.length() as isize)); let requires_line_break_afterward_if_wrapping_on_newlines = - !mapping.byte_range.is_empty() && - scanned_run.run.text.char_at_reverse(mapping.byte_range.end()) == '\n'; + scanned_run.run.text[mapping.byte_range.begin()..mapping.byte_range.end()] + .ends_with('\n'); if requires_line_break_afterward_if_wrapping_on_newlines { byte_range.extend_by(ByteIndex(-1)); // Trim the '\n' } diff --git a/components/net/cookie_storage.rs b/components/net/cookie_storage.rs index 092cdd4882f..0698b8e46cd 100644 --- a/components/net/cookie_storage.rs +++ b/components/net/cookie_storage.rs @@ -7,7 +7,7 @@ use cookie::Cookie; use net_traits::CookieSource; -use rustc_serialize::{Encodable, Encoder}; +use rustc_serialize::Encoder; use std::cmp::Ordering; use url::Url; diff --git a/components/net/lib.rs b/components/net/lib.rs index 90ffd0e0926..97b978f1725 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -19,7 +19,7 @@ extern crate hyper; extern crate immeta; extern crate ipc_channel; #[macro_use] extern crate log; -#[macro_use] extern crate matches; +#[macro_use] #[no_link] extern crate matches; #[macro_use] extern crate mime; extern crate mime_guess; |