diff options
| author | bors <bors@rust-lang.org> | 2018-02-18 03:12:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-18 03:12:14 +0000 |
| commit | e8f03b9438d6516fd7067cfda2f09c925d6d92f2 (patch) | |
| tree | 8cbee3557fe3f889b4b3eaed1761b1ba348a7360 /src/test/compile-fail | |
| parent | 5313e8728f028cb7914f3c9f02804158a5732b52 (diff) | |
| parent | 7948afdc53cabf9330662ec894bf668839880a3c (diff) | |
| download | rust-e8f03b9438d6516fd7067cfda2f09c925d6d92f2.tar.gz rust-e8f03b9438d6516fd7067cfda2f09c925d6d92f2.zip | |
Auto merge of #47544 - U007D:master, r=nikomatsakis
Relax termination_trait's error bound As per [this conversation](https://github.com/withoutboats/failure/issues/130#issuecomment-358572413) with @withoutboats and @bkchr
Diffstat (limited to 'src/test/compile-fail')
| -rw-r--r-- | src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs (renamed from src/test/compile-fail/main-wrong-type-2.rs) | 0 | ||||
| -rw-r--r-- | src/test/compile-fail/rfc-1937-termination-trait/termination-trait-not-satisfied.rs (renamed from src/test/compile-fail/termination-trait-not-satisfied.rs) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/src/test/compile-fail/main-wrong-type-2.rs b/src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs index a63162cf73d..a63162cf73d 100644 --- a/src/test/compile-fail/main-wrong-type-2.rs +++ b/src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs diff --git a/src/test/compile-fail/termination-trait-not-satisfied.rs b/src/test/compile-fail/rfc-1937-termination-trait/termination-trait-not-satisfied.rs index 788c38c55be..788c38c55be 100644 --- a/src/test/compile-fail/termination-trait-not-satisfied.rs +++ b/src/test/compile-fail/rfc-1937-termination-trait/termination-trait-not-satisfied.rs |