user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rustup to rustc 1.37.0-nightly (2887008e0 2019-06-12)

Browse source
This commit is contained in:
bjorn3 2019-06-13 20:44:40 +02:00
parent 5e2ea4f194
commit 6d1bc088a7
10 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/common.rs
View file

@ -18,7 +18,7 @@ pub fn pointer_ty(tcx: TyCtxt) -> types::Type {
}
pub fn clif_type_from_ty<'a, 'tcx: 'a>(
tcx: TyCtxt<'a, 'tcx, 'tcx>,
tcx: TyCtxt<'tcx, 'tcx>,
ty: Ty<'tcx>,
) -> Option<types::Type> {
Some(match ty.sty {
@ -95,7 +95,7 @@ pub fn clif_intcast<'a, 'tcx: 'a>(
pub struct FunctionCx<'a, 'tcx: 'a, B: Backend> {
// FIXME use a reference to `CodegenCx` instead of `tcx`, `module` and `constants` and `caches`
pub tcx: TyCtxt<'a, 'tcx, 'tcx>,
pub tcx: TyCtxt<'tcx, 'tcx>,
pub module: &'a mut Module<B>,
pub pointer_type: Type, // Cached from module
@ -123,7 +123,7 @@ impl<'a, 'tcx: 'a, B: Backend> LayoutOf for FunctionCx<'a, 'tcx, B> {
}
impl<'a, 'tcx, B: Backend + 'a> layout::HasTyCtxt<'tcx> for FunctionCx<'a, 'tcx, B> {
fn tcx<'b>(&'b self) -> TyCtxt<'b, 'tcx, 'tcx> {
fn tcx<'b>(&'b self) -> TyCtxt<'tcx, 'tcx> {
self.tcx
}
}