---

yaml
---
r: 277843
b: refs/heads/try
c: 9ac468b
h: refs/heads/master
i:
  277841: 8cadc61
  277839: 2ce01d6

Author: Ms2ger

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: 3585321d1ed7665cf2c0d828ff0073844d27d831
+refs/heads/try: 9ac468b841cf01e7b575f4c20d10df8096c31f7a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_driver/driver.rs

@@ -148,7 +148,7 @@ pub fn compile_input(sess: &Session,
 
         time(sess.time_passes(),
              "external crate/lib resolution",
-             || LocalCrateReader::new(sess, &cstore, defs, &expanded_crate, &id)
+             || LocalCrateReader::new(sess, &cstore, &defs.borrow(), &expanded_crate, &id)
                     .read_crates(&dep_graph));
 
         time(sess.time_passes(),

branches/try/src/librustc_driver/test.rs

@@ -121,7 +121,7 @@ fn test_env<F>(source_string: &str,
     let dep_graph = DepGraph::new(false);
     let krate = driver::assign_node_ids(&sess, krate);
     let defs = &RefCell::new(hir_map::collect_definitions(&krate));
-    LocalCrateReader::new(&sess, &cstore, defs, &krate, "test_crate").read_crates(&dep_graph);
+    LocalCrateReader::new(&sess, &cstore, &defs.borrow(), &krate, "test_crate").read_crates(&dep_graph);
     let _ignore = dep_graph.in_ignore();
 
     let (_, resolutions, mut hir_forest) = {

branches/try/src/librustc_metadata/creader.rs

@@ -46,7 +46,7 @@ pub struct LocalCrateReader<'a> {
     cstore: &'a CStore,
     creader: CrateReader<'a>,
     krate: &'a ast::Crate,
-    defintions: &'a RefCell<hir_map::Definitions>,
+    defintions: &'a hir_map::Definitions,
 }
 
 pub struct CrateReader<'a> {
@@ -843,7 +843,7 @@ impl<'a> CrateReader<'a> {
 impl<'a> LocalCrateReader<'a> {
     pub fn new(sess: &'a Session,
                cstore: &'a CStore,
-               defs: &'a RefCell<hir_map::Definitions>,
+               defs: &'a hir_map::Definitions,
                krate: &'a ast::Crate,
                local_crate_name: &str)
                -> LocalCrateReader<'a> {
@@ -902,9 +902,8 @@ impl<'a> LocalCrateReader<'a> {
                                                                       PathKind::Crate,
                                                                       true);
 
-                        let defs = self.defintions.borrow();
-                        let def_id = defs.opt_local_def_id(i.id).unwrap();
-                        let len = defs.def_path(def_id.index).data.len();
+                        let def_id = self.defintions.opt_local_def_id(i.id).unwrap();
+                        let len = self.defintions.def_path(def_id.index).data.len();
 
                         self.creader.update_extern_crate(cnum,
                                                          ExternCrate {

branches/try/src/librustc_typeck/check/mod.rs

@@ -3691,37 +3691,14 @@ fn check_expr_with_expectation_and_lvalue_pref<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
                   }
                   None => {
                       check_expr_has_type(fcx, &idx, fcx.tcx().types.err);
-                      let mut err = fcx.type_error_struct(
+                      fcx.type_error_message(
                           expr.span,
                           |actual| {
                               format!("cannot index a value of type `{}`",
                                       actual)
                           },
                           base_t,
                           None);
-                      // Try to give some advice about indexing tuples.
-                      if let ty::TyTuple(_) = base_t.sty {
-                          let mut needs_note = true;
-                          // If the index is an integer, we can show the actual
-                          // fixed expression:
-                          if let hir::ExprLit(ref lit) = idx.node {
-                              if let ast::LitKind::Int(i, ast::LitIntType::Unsuffixed) = lit.node {
-                                  let snip = fcx.tcx().sess.codemap().span_to_snippet(base.span);
-                                  if let Ok(snip) = snip {
-                                      err.span_suggestion(expr.span,
-                                                          "to access tuple elements, use tuple \
-                                                           indexing syntax as shown",
-                                                          format!("{}.{}", snip, i));
-                                      needs_note = false;
-                                  }
-                              }
-                          }
-                          if needs_note {
-                              err.help("to access tuple elements, use tuple indexing \
-                                        syntax (e.g. `tuple.0`)");
-                          }
-                      }
-                      err.emit();
                       fcx.write_ty(id, fcx.tcx().types.err);
                   }
               }

branches/try/src/librustdoc/core.rs

@@ -154,7 +154,7 @@ pub fn run_core(search_paths: SearchPaths,
     let dep_graph = DepGraph::new(false);
 
     let defs = &RefCell::new(hir_map::collect_definitions(&krate));
-    LocalCrateReader::new(&sess, &cstore, &defs, &krate, &name).read_crates(&dep_graph);
+    LocalCrateReader::new(&sess, &cstore, &defs.borrow(), &krate, &name).read_crates(&dep_graph);
 
     // Lower ast -> hir and resolve.
     let (analysis, resolutions, mut hir_forest) = {

branches/try/src/test/compile-fail/issue-27842.rs

@@ -241,7 +241,7 @@ fn compile_program(input: &str, sysroot: PathBuf)
         let dep_graph = DepGraph::new(sess.opts.build_dep_graph());
         let krate = driver::assign_node_ids(&sess, krate);
         let defs = RefCell::new(ast_map::collect_definitions(&krate));
-        LocalCrateReader::new(&sess, &cstore, &defs, &krate, &id).read_crates(&dep_graph);
+        LocalCrateReader::new(&sess, &cstore, &defs.borrow(), &krate, &id).read_crates(&dep_graph);
         let (analysis, resolutions, mut hir_forest) = {
             let defs = &mut *defs.borrow_mut();
             driver::lower_and_resolve(&sess, &id, defs, &krate, dep_graph, MakeGlobMap::No)