about summary refs log tree commit diff
path: root/src/test/run-pass/impl-trait
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-12-21 08:04:57 +0000
committerbors <bors@rust-lang.org>2017-12-21 08:04:57 +0000
commitab7abfcf3457ebc67ac7fef5c3028a6ae4402156 (patch)
tree637d0e2be9f929ff04b2360bd14d6802f002fe74 /src/test/run-pass/impl-trait
parent957dc8de634886143195a1e1a1e1a7d047afe164 (diff)
parente502194e7e2605b461c3e24d30fdc5def4e1c166 (diff)
downloadrust-ab7abfcf3457ebc67ac7fef5c3028a6ae4402156.tar.gz
rust-ab7abfcf3457ebc67ac7fef5c3028a6ae4402156.zip
Auto merge of #46754 - cramertj:refactor-arg-impl, r=nikomatsakis
Refactor argument-position impl Trait

Fixes https://github.com/rust-lang/rust/issues/46685, https://github.com/rust-lang/rust/issues/46470

r? @nikomatsakis
cc @chrisvittal
Diffstat (limited to 'src/test/run-pass/impl-trait')
-rw-r--r--src/test/run-pass/impl-trait/lifetimes.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/run-pass/impl-trait/lifetimes.rs b/src/test/run-pass/impl-trait/lifetimes.rs
index 0f2f67fd89a..a56f083e08f 100644
--- a/src/test/run-pass/impl-trait/lifetimes.rs
+++ b/src/test/run-pass/impl-trait/lifetimes.rs
@@ -57,9 +57,8 @@ fn pass_through_elision_with_fn_path<T: Fn(&u32) -> &u32>(
     x: &T
 ) -> impl Into<&impl Fn(&u32) -> &u32> { x }
 
-// FIXME(cramertj) Currently ICEing, part of issue #46685:
-// fn foo(x: &impl Debug) -> impl Into<&impl Debug> { x }
-// Works:
+fn foo(x: &impl Debug) -> impl Into<&impl Debug> { x }
+fn foo_explicit_lifetime<'a>(x: &'a impl Debug) -> impl Into<&'a impl Debug> { x }
 fn foo_no_outer_impl(x: &impl Debug) -> &impl Debug { x }
 fn foo_explicit_arg<T: Debug>(x: &T) -> impl Into<&impl Debug> { x }