From a6c92f0a179c4f048aaa5145c438611175b41a0d Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Wed, 6 Jun 2012 14:19:52 -0700
Subject: Revert "Revert "Merge pull request #2516 from mozilla/incoming" due
 to failures"

This reverts commit 9fae95860de510f6874810cf43efb83f101246ef.
---
 src/rustc/metadata/decoder.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/rustc/metadata/decoder.rs')

diff --git a/src/rustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs
index 644d519fc0f..4df45033a77 100644
--- a/src/rustc/metadata/decoder.rs
+++ b/src/rustc/metadata/decoder.rs
@@ -7,7 +7,6 @@ import syntax::{ast, ast_util};
 import syntax::attr;
 import middle::ty;
 import syntax::ast_map;
-import common::*;
 import tydecode::{parse_ty_data, parse_def_id, parse_bounds_data,
         parse_ident};
 import syntax::print::pprust;
@@ -15,6 +14,7 @@ import cmd=cstore::crate_metadata;
 import util::ppaux::ty_to_str;
 import ebml::deserializer;
 import syntax::diagnostic::span_handler;
+import common::*;
 
 export class_dtor;
 export get_class_fields;
-- 
cgit 1.4.1-3-g733a5