Skip to content

Commit 8fd316f

Browse files
committed
pacify the mercilous tidy
1 parent 3b1a170 commit 8fd316f

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/librustc/ty/context.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,10 @@ impl<'a, 'tcx> Lift<'tcx> for &'a Goal<'a> {
15291529

15301530
impl<'a, 'tcx> Lift<'tcx> for &'a Slice<Goal<'a>> {
15311531
type Lifted = &'tcx Slice<Goal<'tcx>>;
1532-
fn lift_to_tcx<'b, 'gcx>(&self, tcx: TyCtxt<'b, 'gcx, 'tcx>) -> Option<&'tcx Slice<Goal<'tcx>>> {
1532+
fn lift_to_tcx<'b, 'gcx>(
1533+
&self,
1534+
tcx: TyCtxt<'b, 'gcx, 'tcx>,
1535+
) -> Option<&'tcx Slice<Goal<'tcx>>> {
15331536
if tcx.interners.arena.in_arena(*self as *const _) {
15341537
return Some(unsafe { mem::transmute(*self) });
15351538
}
@@ -1544,7 +1547,10 @@ impl<'a, 'tcx> Lift<'tcx> for &'a Slice<Goal<'a>> {
15441547

15451548
impl<'a, 'tcx> Lift<'tcx> for &'a Slice<Clause<'a>> {
15461549
type Lifted = &'tcx Slice<Clause<'tcx>>;
1547-
fn lift_to_tcx<'b, 'gcx>(&self, tcx: TyCtxt<'b, 'gcx, 'tcx>) -> Option<&'tcx Slice<Clause<'tcx>>> {
1550+
fn lift_to_tcx<'b, 'gcx>(
1551+
&self,
1552+
tcx: TyCtxt<'b, 'gcx, 'tcx>,
1553+
) -> Option<&'tcx Slice<Clause<'tcx>>> {
15481554
if tcx.interners.arena.in_arena(*self as *const _) {
15491555
return Some(unsafe { mem::transmute(*self) });
15501556
}

src/librustc_traits/chalk_context.rs

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
111
use chalk_engine::fallible::Fallible as ChalkEngineFallible;
212
use chalk_engine::{context, hh::HhGoal, DelayedLiteral, ExClause};
313
use rustc::infer::canonical::{

0 commit comments

Comments
 (0)