From 84b49b2d355e49c429703eade10f93680cc3bd47 Mon Sep 17 00:00:00 2001
From: Eduard Burtescu <edy.burt@gmail.com>
Date: Sun, 14 Jun 2015 02:35:18 +0300
Subject: [PATCH] rustc_resolve: don't require redundant arguments to
 resolve_crate.

---
 src/librustc_driver/driver.rs | 6 +-----
 src/librustc_driver/test.rs   | 2 +-
 src/librustc_resolve/lib.rs   | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
index 7297d9c00b4..8640bcfe506 100644
--- a/src/librustc_driver/driver.rs
+++ b/src/librustc_driver/driver.rs
@@ -602,11 +602,7 @@ pub fn phase_3_run_analysis_passes<'tcx>(sess: Session,
         glob_map,
     } =
         time(time_passes, "resolution", (),
-             |_| resolve::resolve_crate(&sess,
-                                        &ast_map,
-                                        &lang_items,
-                                        krate,
-                                        make_glob_map));
+             |_| resolve::resolve_crate(&sess, &ast_map, make_glob_map));
 
     // Discard MTWT tables that aren't required past resolution.
     syntax::ext::mtwt::clear_tables();
diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs
index 4091351b5a5..5991fc5c193 100644
--- a/src/librustc_driver/test.rs
+++ b/src/librustc_driver/test.rs
@@ -126,7 +126,7 @@ fn test_env<F>(source_string: &str,
     // run just enough stuff to build a tcx:
     let lang_items = lang_items::collect_language_items(krate, &sess);
     let resolve::CrateMap { def_map, freevars, .. } =
-        resolve::resolve_crate(&sess, &ast_map, &lang_items, krate, resolve::MakeGlobMap::No);
+        resolve::resolve_crate(&sess, &ast_map, resolve::MakeGlobMap::No);
     let named_region_map = resolve_lifetime::krate(&sess, krate, &def_map);
     let region_map = region::resolve_crate(&sess, krate);
     let tcx = ty::mk_ctxt(sess,
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 787f914718d..5d10b0d9a57 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -55,7 +55,6 @@ use rustc::lint;
 use rustc::metadata::csearch;
 use rustc::metadata::decoder::{DefLike, DlDef, DlField, DlImpl};
 use rustc::middle::def::*;
-use rustc::middle::lang_items::LanguageItems;
 use rustc::middle::pat_util::pat_bindings;
 use rustc::middle::privacy::*;
 use rustc::middle::subst::{ParamSpace, FnSpace, TypeSpace};
@@ -3689,10 +3688,9 @@ pub enum MakeGlobMap {
 /// Entry point to crate resolution.
 pub fn resolve_crate<'a, 'tcx>(session: &'a Session,
                                ast_map: &'a ast_map::Map<'tcx>,
-                               _: &LanguageItems,
-                               krate: &Crate,
                                make_glob_map: MakeGlobMap)
                                -> CrateMap {
+    let krate = ast_map.krate();
     let mut resolver = Resolver::new(session, ast_map, krate.span, make_glob_map);
 
     build_reduced_graph::build_reduced_graph(&mut resolver, krate);