From da0597510aa8dc5f5626b32a08ecc57593ca389c Mon Sep 17 00:00:00 2001
From: Robin Gloster <robin@loc-com.de>
Date: Wed, 7 Jan 2015 21:30:03 +0100
Subject: [PATCH] macro syntax changes

---
 examples/server.rs | 4 +---
 src/lib.rs         | 8 +++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/examples/server.rs b/examples/server.rs
index 85ebc0f1..5bedfc14 100644
--- a/examples/server.rs
+++ b/examples/server.rs
@@ -1,7 +1,5 @@
-#![feature(macro_rules, phase)]
-
 extern crate hyper;
-#[phase(plugin, link)] extern crate log;
+#[macro_use] extern crate log;
 
 use std::io::util::copy;
 use std::io::net::ip::Ipv4Addr;
diff --git a/src/lib.rs b/src/lib.rs
index 4b72a1c6..bba1e984 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,4 @@
-#![feature(macro_rules, phase, default_type_params,
-           slicing_syntax, globs, associated_types,
-           old_orphan_check)]
+#![feature(slicing_syntax, old_orphan_check)]
 #![deny(missing_docs)]
 #![deny(warnings)]
 #![experimental]
@@ -131,7 +129,7 @@ extern crate "rustc-serialize" as serialize;
 extern crate time;
 extern crate url;
 extern crate openssl;
-#[phase(plugin,link)] extern crate log;
+#[macro_use] extern crate log;
 #[cfg(test)] extern crate test;
 extern crate "unsafe-any" as uany;
 extern crate cookie;
@@ -166,7 +164,7 @@ macro_rules! inspect(
 );
 
 #[cfg(test)]
-#[macro_escape]
+#[macro_use]
 mod mock;
 
 pub mod client;