---

yaml
---
r: 29733
b: refs/heads/incoming
c: 4597fe1
h: refs/heads/master
i:
  29731: 5919db2
v: v3

Author: lkuper

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 0c354898581e195703a887082bf25ea0ea971838
+refs/heads/incoming: 4597fe1320e2a46e88afe1ab785e29808ea8e4de
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/trans/base.rs

@@ -47,7 +47,6 @@ import build::*;
 import shape::*;
 import type_of::*;
 import common::*;
-import type_of::type_of; // Issue #1873
 import common::result;
 import syntax::ast_map::{path, path_mod, path_name};
 

branches/incoming/src/rustc/middle/trans/closure.rs

@@ -7,7 +7,6 @@ import common::*;
 import build::*;
 import base::*;
 import type_of::*;
-import type_of::type_of; // Issue #1873
 import back::abi;
 import syntax::codemap::span;
 import syntax::print::pprust::expr_to_str;