diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 63b923943656504fdc5123d4656e23d5e67370cf..42d888dbbe85b442f4c88ea8da47ef0a7d9b7851 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -88,7 +88,7 @@ pub fn run_core (libs: HashSet<Path>, cfgs: ~[~str], path: &Path) -> (clean::Cra
     let ctxt = @ctxt;
     local_data::set(super::ctxtkey, ctxt);
 
-    let v = @mut RustdocVisitor::new();
+    let mut v = RustdocVisitor::new();
     v.visit(&ctxt.crate);
 
     (v.clean(), analysis)
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 945cb865d3b6b8c764158981587e1126def64624..36caed437f511e07cdab913954f7c8af5594bcaf 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -267,11 +267,11 @@ fn rust_input(cratefile: &str, matches: &getopts::Matches) -> Output {
 /// This input format purely deserializes the json output file. No passes are
 /// run over the deserialized output.
 fn json_input(input: &str) -> Result<Output, ~str> {
-    let input = match File::open(&Path::new(input)) {
+    let mut input = match File::open(&Path::new(input)) {
         Some(f) => f,
         None => return Err(format!("couldn't open {} for reading", input)),
     };
-    match json::from_reader(@mut input as @mut io::Reader) {
+    match json::from_reader(&mut input) {
         Err(s) => Err(s.to_str()),
         Ok(json::Object(obj)) => {
             let mut obj = obj;
@@ -332,6 +332,6 @@ fn json_output(crate: clean::Crate, res: ~[plugins::PluginJson], dst: Path) {
     json.insert(~"crate", crate_json);
     json.insert(~"plugins", json::Object(plugins_json));
 
-    let file = @mut File::create(&dst).unwrap();
-    json::Object(json).to_writer(file as @mut io::Writer);
+    let mut file = File::create(&dst).unwrap();
+    json::Object(json).to_writer(&mut file);
 }
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 480ace2e4194824a13b3a55f3a5b41cae9f757c6..0fbe585b9bf4513c4b8afe3b2b313bf397fe1fdf 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -67,7 +67,7 @@ pub fn run(input: &str, matches: &getopts::Matches) -> int {
     };
     local_data::set(super::ctxtkey, ctx);
 
-    let v = @mut RustdocVisitor::new();
+    let mut v = RustdocVisitor::new();
     v.visit(&ctx.crate);
     let crate = v.clean();
     let (crate, _) = passes::unindent_comments(crate);
diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs
index 03ab85918c759fe3a5df2fc45cc90d2793be2e53..9b6e809f8351f936592d949fa8ac9b58c830d16d 100644
--- a/src/librustdoc/visit_ast.rs
+++ b/src/librustdoc/visit_ast.rs
@@ -32,7 +32,7 @@ pub fn new() -> RustdocVisitor {
 }
 
 impl RustdocVisitor {
-    pub fn visit(@mut self, crate: &ast::Crate) {
+    pub fn visit(&mut self, crate: &ast::Crate) {
         self.attrs = crate.attrs.clone();
         fn visit_struct_def(item: &ast::item, sd: @ast::struct_def, generics:
                             &ast::Generics) -> Struct {