From dce11222ba5fb3189231ac3a97e4f75d06716fde Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Fri, 20 Mar 2015 13:55:11 +0100
Subject: [PATCH] Update some feature gates.

CC #5286.
---
 components/layout/lib.rs | 5 ++---
 components/script/lib.rs | 3 +--
 ports/glutin/lib.rs      | 1 -
 ports/glutin/window.rs   | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index 45322b6edf4..0beebba4c51 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -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)]
diff --git a/components/script/lib.rs b/components/script/lib.rs
index 901a5a19687..e1c8a0b05a9 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -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)]
diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs
index c64ff2a4e91..ccf9570569c 100644
--- a/ports/glutin/lib.rs
+++ b/ports/glutin/lib.rs
@@ -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;
diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
index 5dedff7b46a..dc15454ba26 100644
--- a/ports/glutin/window.rs
+++ b/ports/glutin/window.rs
@@ -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);