Auto merge of #4061 - rust-lang:rustup, r=phansch

Rustup to rustc 1.36.0-nightly (13fde05 2019-05-03) Trying to deal with changes from rust-lang/rust#60462 Moved from #4060 so everyone can collab on the rustup branch.

Author: bors

clippy_lints/src/assign_ops.rs

@@ -99,7 +99,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for AssignOps {
  let parent_fn = cx.tcx.hir().get_parent_item(e.hir_id);
  if_chain! {
  if let Some(trait_ref) = trait_ref_of_method(cx, parent_fn);
- if trait_ref.path.def.def_id() == trait_id;
+ if trait_ref.path.res.def_id() == trait_id;
  then { return; }
  }
  implements_trait($cx, $ty, trait_id, &[$rty])

clippy_lints/src/attrs.rs

@@ -394,7 +394,7 @@ fn is_relevant_expr(cx: &LateContext<'_, '_>, tables: &ty::TypeckTables<'_>, exp
  ExprKind::Ret(None) | ExprKind::Break(_, None) => false,
  ExprKind::Call(path_expr, _) => {
  if let ExprKind::Path(qpath) = &path_expr.node {
- if let Some(fun_id) = tables.qpath_def(qpath, path_expr.hir_id).opt_def_id() {
+ if let Some(fun_id) = tables.qpath_res(qpath, path_expr.hir_id).opt_def_id() {
  !cx.match_def_path(fun_id, &paths::BEGIN_PANIC)
  } else {
  true

clippy_lints/src/consts.rs

@@ -2,7 +2,7 @@
 
 use crate::utils::{clip, sext, unsext};
 use if_chain::if_chain;
-use rustc::hir::def::Def;
+use rustc::hir::def::{DefKind, Res};
 use rustc::hir::*;
 use rustc::lint::LateContext;
 use rustc::ty::subst::{Subst, SubstsRef};
@@ -247,8 +247,8 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
  if_chain! {
  if args.is_empty();
  if let ExprKind::Path(qpath) = &callee.node;
- let def = self.tables.qpath_def(qpath, callee.hir_id);
- if let Some(def_id) = def.opt_def_id();
+ let res = self.tables.qpath_res(qpath, callee.hir_id);
+ if let Some(def_id) = res.opt_def_id();
  let def_path = self.lcx.get_def_path(def_id)
  .iter()
  .map(LocalInternedString::get)
@@ -322,9 +322,9 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
  fn fetch_path(&mut self, qpath: &QPath, id: HirId) -> Option<Constant> {
  use rustc::mir::interpret::GlobalId;
 
- let def = self.tables.qpath_def(qpath, id);
- match def {
- Def::Const(def_id) | Def::AssociatedConst(def_id) => {
+ let res = self.tables.qpath_res(qpath, id);
+ match res {
+ Res::Def(DefKind::Const, def_id) | Res::Def(DefKind::AssociatedConst, def_id) => {
  let substs = self.tables.node_substs(id);
  let substs = if self.substs.is_empty() {
  substs
@@ -338,11 +338,11 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
  };
 
  let result = self.lcx.tcx.const_eval(self.param_env.and(gid)).ok()?;
- let ret = miri_to_const(self.lcx.tcx, &result);
- if ret.is_some() {
+ let result = miri_to_const(self.lcx.tcx, &result);
+ if result.is_some() {
  self.needed_resolution = true;
  }
- ret
+ result
  },
  // FIXME: cover all usable cases.
  _ => None,

clippy_lints/src/default_trait_access.rs

@@ -36,7 +36,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for DefaultTraitAccess {
  if let ExprKind::Call(ref path, ..) = expr.node;
  if !any_parent_is_automatically_derived(cx.tcx, expr.hir_id);
  if let ExprKind::Path(ref qpath) = path.node;
- if let Some(def_id) = cx.tables.qpath_def(qpath, path.hir_id).opt_def_id();
+ if let Some(def_id) = cx.tables.qpath_res(qpath, path.hir_id).opt_def_id();
  if cx.match_def_path(def_id, &paths::DEFAULT_TRAIT_METHOD);
  then {
  match qpath {

clippy_lints/src/drop_bounds.rs

@@ -55,7 +55,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for DropBounds {
 fn lint_bound<'a, 'tcx>(cx: &rustc::lint::LateContext<'a, 'tcx>, bound: &'tcx GenericBound) {
  if_chain! {
  if let GenericBound::Trait(t, _) = bound;
- if let Some(def_id) = t.trait_ref.path.def.opt_def_id();
+ if let Some(def_id) = t.trait_ref.path.res.opt_def_id();
  if cx.match_def_path(def_id, &paths::DROP_TRAIT);
  then {
  span_lint(

clippy_lints/src/drop_forget_ref.rs

@@ -114,7 +114,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for DropForgetRef {
  if let ExprKind::Call(ref path, ref args) = expr.node;
  if let ExprKind::Path(ref qpath) = path.node;
  if args.len() == 1;
- if let Some(def_id) = cx.tables.qpath_def(qpath, path.hir_id).opt_def_id();
+ if let Some(def_id) = cx.tables.qpath_res(qpath, path.hir_id).opt_def_id();
  then {
  let lint;
  let msg;

clippy_lints/src/enum_glob_use.rs

@@ -1,7 +1,7 @@
 //! lint on `use`ing all variants of an enum
 
 use crate::utils::span_lint;
-use rustc::hir::def::Def;
+use rustc::hir::def::{DefKind, Res};
 use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::{declare_lint_pass, declare_tool_lint};
@@ -43,7 +43,7 @@ impl EnumGlobUse {
  return; // re-exports are fine
  }
  if let ItemKind::Use(ref path, UseKind::Glob) = item.node {
- if let Def::Enum(_) = path.def {
+ if let Res::Def(DefKind::Enum, _) = path.res {
  span_lint(cx, ENUM_GLOB_USE, item.span, "don't use glob imports for enum variants");
  }
  }

clippy_lints/src/eval_order_dependence.rs

@@ -63,7 +63,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EvalOrderDependence {
  if let ExprKind::Path(ref qpath) = lhs.node {
  if let QPath::Resolved(_, ref path) = *qpath {
  if path.segments.len() == 1 {
- if let def::Def::Local(var) = cx.tables.qpath_def(qpath, lhs.hir_id) {
+ if let def::Res::Local(var) = cx.tables.qpath_res(qpath, lhs.hir_id) {
  let mut visitor = ReadVisitor {
  cx,
  var,
@@ -295,7 +295,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ReadVisitor<'a, 'tcx> {
  if_chain! {
  if let QPath::Resolved(None, ref path) = *qpath;
  if path.segments.len() == 1;
- if let def::Def::Local(local_id) = self.cx.tables.qpath_def(qpath, expr.hir_id);
+ if let def::Res::Local(local_id) = self.cx.tables.qpath_res(qpath, expr.hir_id);
  if local_id == self.var;
  // Check that this is a read, not a write.
  if !is_in_assignment_position(self.cx, expr);

clippy_lints/src/fallible_impl_from.rs

@@ -61,7 +61,7 @@ fn lint_impl_body<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, impl_span: Span, impl_it
  if_chain! {
  if let ExprKind::Call(ref func_expr, _) = expr.node;
  if let ExprKind::Path(QPath::Resolved(_, ref path)) = func_expr.node;
- if let Some(path_def_id) = path.def.opt_def_id();
+ if let Some(path_def_id) = path.res.opt_def_id();
  if self.lcx.match_def_path(path_def_id, &BEGIN_PANIC) ||
  self.lcx.match_def_path(path_def_id, &BEGIN_PANIC_FMT);
  if is_expn_of(expr.span, "unreachable").is_none();

clippy_lints/src/functions.rs

@@ -3,7 +3,7 @@ use std::convert::TryFrom;
 use crate::utils::{iter_input_pats, snippet, snippet_opt, span_lint, type_is_unsafe_function};
 use matches::matches;
 use rustc::hir;
-use rustc::hir::def::Def;
+use rustc::hir::def::Res;
 use rustc::hir::intravisit;
 use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc::ty;
@@ -333,7 +333,7 @@ impl<'a, 'tcx> hir::intravisit::Visitor<'tcx> for DerefVisitor<'a, 'tcx> {
 impl<'a, 'tcx: 'a> DerefVisitor<'a, 'tcx> {
  fn check_arg(&self, ptr: &hir::Expr) {
  if let hir::ExprKind::Path(ref qpath) = ptr.node {
- if let Def::Local(id) = self.cx.tables.qpath_def(qpath, ptr.hir_id) {
+ if let Res::Local(id) = self.cx.tables.qpath_res(qpath, ptr.hir_id) {
  if self.ptrs.contains(&id) {
  span_lint(
  self.cx,