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

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

View file

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

View file

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

View file

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

View file

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