mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rebase issue

Browse Source
This commit is contained in:
varkor 2019-02-15 23:34:04 +00:00
parent 9cfdb80085
commit 18ce997e51
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc_lint/nonstandard_style.rs
View File

@ -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,

2
src/librustc_typeck/check/compare_method.rs
View File

@ -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