about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Schneider <github35764891676564198441@oli-obk.de>2018-05-24 14:11:56 +0200
committerOliver Schneider <github35764891676564198441@oli-obk.de>2018-05-24 20:49:38 +0200
commit5c8741f32eabbed4d11a36f6ec5bbf109cdfa69b (patch)
tree29bebea8f15a18532c4901d590a85202d0b16606
parent80a1488601c9da1687a055a6970e78b98a356ae6 (diff)
downloadrust-5c8741f32eabbed4d11a36f6ec5bbf109cdfa69b.tar.gz
rust-5c8741f32eabbed4d11a36f6ec5bbf109cdfa69b.zip
Use in-band-lifetimes instead of unused explicit lifetimes
-rw-r--r--src/librustc/lib.rs1
-rw-r--r--src/librustc/ty/layout.rs4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 1d53a305193..ddbd3d7caf3 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -68,6 +68,7 @@
 #![feature(trusted_len)]
 #![feature(catch_expr)]
 #![feature(test)]
+#![feature(in_band_lifetimes)]
 
 #![recursion_limit="512"]
 
diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs
index 98df4b150fa..6169b3bc33f 100644
--- a/src/librustc/ty/layout.rs
+++ b/src/librustc/ty/layout.rs
@@ -1513,7 +1513,7 @@ impl<'a, 'tcx> LayoutOf for LayoutCx<'tcx, ty::maps::TyCtxtAt<'a, 'tcx, 'tcx>> {
 }
 
 // Helper (inherent) `layout_of` methods to avoid pushing `LayoutCx` to users.
-impl<'a, 'tcx, 'empty> TyCtxt<'a, 'tcx, 'empty> {
+impl TyCtxt<'a, 'tcx, '_> {
     /// Computes the layout of a type. Note that this implicitly
     /// executes in "reveal all" mode.
     #[inline]
@@ -1527,7 +1527,7 @@ impl<'a, 'tcx, 'empty> TyCtxt<'a, 'tcx, 'empty> {
     }
 }
 
-impl<'a, 'tcx, 'empty> ty::maps::TyCtxtAt<'a, 'tcx, 'empty> {
+impl ty::maps::TyCtxtAt<'a, 'tcx, '_> {
     /// Computes the layout of a type. Note that this implicitly
     /// executes in "reveal all" mode.
     #[inline]