Fix rebase issue

Author: varkor

src/librustc_lint/nonstandard_style.rs

@@ -456,7 +456,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NonUpperCaseGlobals {
         }
     }
 
-    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,

src/librustc_typeck/check/compare_method.rs

@@ -842,7 +842,7 @@ fn compare_synthetic_generics<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
                                 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