Skip to content

Commit

Permalink
Update some feature gates.
Browse files Browse the repository at this point in the history
CC #5286.
  • Loading branch information
Ms2ger committed Mar 20, 2015
1 parent 2c85c1d commit dce1122
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
5 changes: 2 additions & 3 deletions components/layout/lib.rs
Expand Up @@ -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)]
Expand Down
3 changes: 1 addition & 2 deletions components/script/lib.rs
Expand Up @@ -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)]
Expand Down
1 change: 0 additions & 1 deletion ports/glutin/lib.rs
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ports/glutin/window.rs
Expand Up @@ -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);
Expand Down

5 comments on commit dce1122

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from jdm
at Ms2ger@dce1122

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging Ms2ger/servo/gates = dce1122 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ms2ger/servo/gates = dce1122 merged ok, testing candidate = 6ffd459

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 6ffd459

Please sign in to comment.