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

Auto merge of #10928 - servo:warnings, r=mbrubeck

Browse source 
Fix some warnings

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10928)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-30 05:16:46 -07:00
commit 0f1a921ba6
5 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/fragment.rs
View file

@ -2021,8 +2021,7 @@ impl Fragment {
return false return false
} }
let length = first_unscanned_text.text.len(); if first_unscanned_text.text.ends_with('\n') {
if length != 0 && first_unscanned_text.text.char_at_reverse(length) == '\n' {
return false return false
} }

1
components/layout/lib.rs
View file

@ -11,7 +11,6 @@
#![feature(plugin)] #![feature(plugin)]
#![feature(raw)] #![feature(raw)]
#![feature(step_by)] #![feature(step_by)]
#![feature(str_char)]
#![feature(unsafe_no_drop_flag)] #![feature(unsafe_no_drop_flag)]
#![deny(unsafe_code)] #![deny(unsafe_code)]

6
components/layout/text.rs
View file

@ -339,15 +339,15 @@ impl TextRunScanner {
break; break;
} }
}; };
let mut mapping = mappings.next().unwrap(); let mapping = mappings.next().unwrap();
let scanned_run = runs[mapping.text_run_index].clone(); let scanned_run = runs[mapping.text_run_index].clone();
let mut byte_range = Range::new(ByteIndex(mapping.byte_range.begin() as isize), let mut byte_range = Range::new(ByteIndex(mapping.byte_range.begin() as isize),
ByteIndex(mapping.byte_range.length() as isize)); ByteIndex(mapping.byte_range.length() as isize));
let requires_line_break_afterward_if_wrapping_on_newlines = let requires_line_break_afterward_if_wrapping_on_newlines =
!mapping.byte_range.is_empty() && scanned_run.run.text[mapping.byte_range.begin()..mapping.byte_range.end()]
scanned_run.run.text.char_at_reverse(mapping.byte_range.end()) == '\n'; .ends_with('\n');
if requires_line_break_afterward_if_wrapping_on_newlines { if requires_line_break_afterward_if_wrapping_on_newlines {
byte_range.extend_by(ByteIndex(-1)); // Trim the '\n' byte_range.extend_by(ByteIndex(-1)); // Trim the '\n'
} }

2
components/net/cookie_storage.rs
View file

@ -7,7 +7,7 @@
use cookie::Cookie; use cookie::Cookie;
use net_traits::CookieSource; use net_traits::CookieSource;
use rustc_serialize::{Encodable, Encoder}; use rustc_serialize::Encoder;
use std::cmp::Ordering; use std::cmp::Ordering;
use url::Url; use url::Url;

2
components/net/lib.rs
View file

@ -19,7 +19,7 @@ extern crate hyper;
extern crate immeta; extern crate immeta;
extern crate ipc_channel; extern crate ipc_channel;
#[macro_use] extern crate log; #[macro_use] extern crate log;
#[macro_use] extern crate matches; #[macro_use] #[no_link] extern crate matches;
#[macro_use] #[macro_use]
extern crate mime; extern crate mime;
extern crate mime_guess; extern crate mime_guess;