Merge remote-tracking branch 'upstream/master' into rustup

diff --cc clippy_dev/src/new_lint.rs
index 03d2ef3d19edd4406c4c0d86eb62ceff71f23d72,03d2ef3d19edd4406c4c0d86eb62ceff71f23d72..10a8f31f4573f790d63a4c786037abff9ce40004
--- 1/clippy_dev/src/new_lint.rs
--- 2/clippy_dev/src/new_lint.rs
+++ b/clippy_dev/src/new_lint.rs
@@@ -438,7 -438,7 +438,7 @@@ fn setup_mod_file(path: &Path, lint: &L
      let mut lint_context = None;
  
      let mut iter = rustc_lexer::tokenize(&file_contents).map(|t| {
--        let range = offset..offset + t.len;
++        let range = offset..offset + t.len as usize;
          offset = range.end;
  
          LintDeclSearchResult {

diff --cc clippy_dev/src/update_lints.rs
index aed38bc2817607266ed65679a74afed63a427069,aed38bc2817607266ed65679a74afed63a427069..05e79a241884f43bb9175afd3b01b483e6596959
--- 1/clippy_dev/src/update_lints.rs
--- 2/clippy_dev/src/update_lints.rs
+++ b/clippy_dev/src/update_lints.rs
@@@ -836,7 -836,7 +836,7 @@@ pub(crate) struct LintDeclSearchResult<
  fn parse_contents(contents: &str, module: &str, lints: &mut Vec<Lint>) {
      let mut offset = 0usize;
      let mut iter = tokenize(contents).map(|t| {
--        let range = offset..offset + t.len;
++        let range = offset..offset + t.len as usize;
          offset = range.end;
  
          LintDeclSearchResult {
@@@ -899,7 -899,7 +899,7 @@@
  fn parse_deprecated_contents(contents: &str, lints: &mut Vec<DeprecatedLint>) {
      let mut offset = 0usize;
      let mut iter = tokenize(contents).map(|t| {
--        let range = offset..offset + t.len;
++        let range = offset..offset + t.len as usize;
          offset = range.end;
  
          LintDeclSearchResult {
@@@ -946,7 -946,7 +946,7 @@@ fn parse_renamed_contents(contents: &st
      for line in contents.lines() {
          let mut offset = 0usize;
          let mut iter = tokenize(line).map(|t| {
--            let range = offset..offset + t.len;
++            let range = offset..offset + t.len as usize;
              offset = range.end;
  
              LintDeclSearchResult {

diff --cc clippy_lints/src/matches/mod.rs
Simple merge

diff --cc clippy_lints/src/missing_doc.rs
index 88ba002927a949d4512c94809a0f3ec2f69381f2,7ef80b1a5960e8288f07c5e8b229c55e5c855b45..ee81f72a0e7081825f6d79269c67f37314094cfa
--- 1/clippy_lints/src/missing_doc.rs
--- 2/clippy_lints/src/missing_doc.rs
+++ b/clippy_lints/src/missing_doc.rs
@@@ -7,10 -7,12 +7,12 @@@
  
  use clippy_utils::attrs::is_doc_hidden;
  use clippy_utils::diagnostics::span_lint;
- use rustc_ast::ast;
+ use clippy_utils::is_from_proc_macro;
+ use if_chain::if_chain;
+ use rustc_ast::ast::{self, MetaItem, MetaItemKind};
  use rustc_hir as hir;
  use rustc_lint::{LateContext, LateLintPass, LintContext};
 -use rustc_middle::ty::{self, DefIdTree};
 +use rustc_middle::ty::DefIdTree;
  use rustc_session::{declare_tool_lint, impl_lint_pass};
  use rustc_span::def_id::CRATE_DEF_ID;
  use rustc_span::source_map::Span;

diff --cc clippy_lints/src/utils/internal_lints.rs
index b309653291b11ce58d3d1d3a45eb696705490cbd,3de96f72bbcddc5f710fa6ba427b8e768bf3f6dc..5dcacd604be45f6b0a4c4844e05ece2e13287198
--- 1/clippy_lints/src/utils/internal_lints.rs
--- 2/clippy_lints/src/utils/internal_lints.rs
+++ b/clippy_lints/src/utils/internal_lints.rs
@@@ -496,12 -496,12 +496,14 @@@ impl<'tcx> LateLintPass<'tcx> for LintW
                      cx,
                  };
                  let body_id = cx.tcx.hir().body_owned_by(
--                    impl_item_refs
--                        .iter()
--                        .find(|iiref| iiref.ident.as_str() == "get_lints")
--                        .expect("LintPass needs to implement get_lints")
--                        .id
--                        .hir_id(),
++                    cx.tcx.hir().local_def_id(
++                        impl_item_refs
++                            .iter()
++                            .find(|iiref| iiref.ident.as_str() == "get_lints")
++                            .expect("LintPass needs to implement get_lints")
++                            .id
++                            .hir_id(),
++                    ),
                  );
                  collector.visit_expr(&cx.tcx.hir().body(body_id).value);
              }

diff --cc clippy_utils/src/lib.rs
Simple merge