From 34672e5b17ed9992a10ac9944e8530bea11ec5d7 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 10 Oct 2012 14:37:54 -0700
Subject: [PATCH] Move an allow(non_implicitly_copyable_typarams) attribute to
 a smaller scope

---
 src/servo/content/content_task.rs | 3 ++-
 src/servo/servo.rc                | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/servo/content/content_task.rs b/src/servo/content/content_task.rs
index 242a799eb08..47deffd094f 100644
--- a/src/servo/content/content_task.rs
+++ b/src/servo/content/content_task.rs
@@ -134,6 +134,7 @@ fn task_from_context(cx: *JSContext) -> &Content unsafe {
     cast::reinterpret_cast(&JS_GetContextPrivate(cx))
 }
 
+#[allow(non_implicitly_copyable_typarams)]
 impl Content {
 
     fn start() {
@@ -202,7 +203,7 @@ impl Content {
             //TODO: support extra args. requires passing a *jsval argv
             JS_CallFunctionValue(self.cx.ptr, thisValue, timerData.funval,
                                  0, null(), ptr::to_unsafe_ptr(&rval));
-            self.relayout(self.document.get(), &option::get(&self.doc_url));
+            self.relayout(self.document.get(), &self.doc_url.get());
             return true;
           }
 
diff --git a/src/servo/servo.rc b/src/servo/servo.rc
index be89350001b..c8de41af89d 100755
--- a/src/servo/servo.rc
+++ b/src/servo/servo.rc
@@ -39,7 +39,6 @@ pub mod dom {
     pub mod window;
 }
 
-#[allow(non_implicitly_copyable_typarams)]
 pub mod content {
     pub mod content_task;
 }