-
Notifications
You must be signed in to change notification settings - Fork 12.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Only consider impliciy unboxed closure impl if the obligation is
actually for `Fn`, `FnMut`, or `FnOnce`. Fixes #18019
- Loading branch information
1 parent
4a382d7
commit 590a61f
Showing
2 changed files
with
52 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
// Test that we correctly infer that `E` must be `()` here. This is | ||
// known because there is just one impl that could apply where | ||
// `Self=()`. | ||
|
||
pub trait FromError<E> { | ||
fn from_error(err: E) -> Self; | ||
} | ||
|
||
impl<E> FromError<E> for E { | ||
fn from_error(err: E) -> E { | ||
err | ||
} | ||
} | ||
|
||
fn test() -> Result<(), ()> { | ||
Err(FromError::from_error(())) | ||
} | ||
|
||
fn main() { | ||
let result = (|| Err(FromError::from_error(())))(); | ||
let foo: () = result.unwrap_or(()); | ||
} |
590a61f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from pcwalton
at nikomatsakis@590a61f
590a61f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging nikomatsakis/rust/issue-18019 = 590a61f into auto
590a61f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nikomatsakis/rust/issue-18019 = 590a61f merged ok, testing candidate = 88f35be5
590a61f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1784
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1787
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1778
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1784
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1781
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1780
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1780
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1784
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1778
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1777
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1780
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1436
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1435
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1437
exception: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/274
exception: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/275
exception: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/267