From: varkor <github@varkor.com>
Date: Fri, 15 Feb 2019 23:34:04 +0000 (+0000)
Subject: Fix rebase issue
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=18ce997e51117d3dd40aa1187a2c3cdf58f74167;hp=9cfdb800859a5a5cea876e97232644325931f4fc;p=rust.git

Fix rebase issue
---

diff --git a/src/librustc_lint/nonstandard_style.rs b/src/librustc_lint/nonstandard_style.rs
index ee5e715161a..7c66289703a 100644
--- a/src/librustc_lint/nonstandard_style.rs
+++ b/src/librustc_lint/nonstandard_style.rs
@@ -456,7 +456,7 @@ fn check_pat(&mut self, cx: &LateContext<'_, '_>, p: &hir::Pat) {
         }
     }
 
-    fn check_generic_param(&mut self, cx: &LateContext, param: &hir::GenericParam) {
+    fn check_generic_param(&mut self, cx: &LateContext<'_, '_>, param: &hir::GenericParam) {
         if let GenericParamKind::Const { .. } = param.kind {
             NonUpperCaseGlobals::check_upper_case(
                 cx,
diff --git a/src/librustc_typeck/check/compare_method.rs b/src/librustc_typeck/check/compare_method.rs
index bc323e2cf8a..5f1c2efb6a4 100644
--- a/src/librustc_typeck/check/compare_method.rs
+++ b/src/librustc_typeck/check/compare_method.rs
@@ -842,7 +842,7 @@ fn nested_visit_map<'this>(
                                 GenericParamKind::Lifetime { .. } => None,
                                 GenericParamKind::Type { .. } |
                                 GenericParamKind::Const { .. } => {
-                                    if param.hir_id == impl_node_id {
+                                    if param.hir_id == impl_hir_id {
                                         Some(&param.bounds)
                                     } else {
                                         None