rollup merge of #18630 : nikomatsakis/purge-the-bars

diff --cc src/librustc/middle/check_const.rs
Simple merge

diff --cc src/librustc/middle/pat_util.rs
Simple merge

diff --cc src/librustc/middle/privacy.rs
Simple merge

diff --cc src/librustc/middle/resolve.rs
Simple merge

diff --cc src/librustc/middle/trans/base.rs
Simple merge

diff --cc src/librustc/middle/trans/consts.rs
Simple merge

diff --cc src/librustc/middle/ty.rs
Simple merge

diff --cc src/librustc/middle/typeck/astconv.rs
index 32fd385aa5d023c9477323e35d6bc329ccea4c09,05d315e5fec32cbdfa64681b7e56526f16d43184..ae0bbd617e23343f2d8cb22a70377c8efc03ac4e
--- 1/src/librustc/middle/typeck/astconv.rs
--- 2/src/librustc/middle/typeck/astconv.rs
+++ b/src/librustc/middle/typeck/astconv.rs
@@@ -894,13 -907,8 +907,8 @@@ pub fn ast_ty_to_ty<'tcx, AC: AstConv<'
  
                  ty::mk_closure(tcx, fn_decl)
              }
-             ast::TyUnboxedFn(..) => {
-                 tcx.sess.span_err(ast_ty.span,
-                                   "cannot use unboxed functions here");
-                 ty::mk_err()
-             }
              ast::TyPath(ref path, ref bounds, id) => {
 -                let a_def = match tcx.def_map.borrow().find(&id) {
 +                let a_def = match tcx.def_map.borrow().get(&id) {
                      None => {
                          tcx.sess
                             .span_bug(ast_ty.span,

diff --cc src/librustc/middle/typeck/check/mod.rs
Simple merge

diff --cc src/librustc/middle/typeck/collect.rs
Simple merge

diff --cc src/librustc/middle/typeck/infer/error_reporting.rs
Simple merge

diff --cc src/librustdoc/clean/inline.rs
Simple merge

diff --cc src/librustdoc/clean/mod.rs
Simple merge

diff --cc src/librustdoc/html/format.rs
Simple merge