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

auto merge of #5287 : Ms2ger/servo/gates, r=jdm

Browse source 
CC #5286.
This commit is contained in:
bors-servo 2015-03-20 09:12:51 -06:00
commit 6ffd459479
4 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/layout/lib.rs
View file

@ -6,10 +6,9 @@
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(collections)] #![feature(collections)]
#![feature(core)] #![feature(core)]
#![feature(hash)]
#![feature(int_uint)] #![feature(int_uint)]
#![feature(io)] #![feature(old_io)]
#![feature(path)] #![feature(old_path)]
#![feature(plugin)] #![feature(plugin)]
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]

3
components/script/lib.rs
View file

@ -6,9 +6,8 @@
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(collections)] #![feature(collections)]
#![feature(core)] #![feature(core)]
#![feature(hash)]
#![feature(int_uint)] #![feature(int_uint)]
#![feature(io)] #![feature(old_io)]
#![feature(plugin)] #![feature(plugin)]
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]

1
ports/glutin/lib.rs
View file

@ -5,7 +5,6 @@
//! A simple application that uses glutin to open a window for Servo to display in. //! A simple application that uses glutin to open a window for Servo to display in.
#![feature(int_uint)] #![feature(int_uint)]
#![feature(core)]
#![feature(box_syntax)] #![feature(box_syntax)]
#[macro_use] extern crate bitflags; #[macro_use] extern crate bitflags;

2
ports/glutin/window.rs
View file

@ -447,7 +447,7 @@ impl WindowMethods for Window {
fn set_page_title(&self, title: Option<String>) { fn set_page_title(&self, title: Option<String>) {
let title = match title { let title = match title {
Some(ref title) if title.len() > 0 => title.as_slice(), Some(ref title) if title.len() > 0 => &**title,
_ => "untitled", _ => "untitled",
}; };
let title = format!("{} - Servo", title); let title = format!("{} - Servo", title);