Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Give where clauses priority over builtin rules. Fixes #20959.
- Loading branch information
1 parent
06e798a
commit 2b8678c
Showing
2 changed files
with
31 additions
and
0 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
23 changes: 23 additions & 0 deletions
23
src/test/run-pass/trait-false-ambiguity-where-clause-builtin-bound.rs
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,23 @@ | ||
// Copyright 2015 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 do not error out because of a (False) ambiguity | ||
// between the builtin rules for Sized and the where clause. Issue | ||
// #20959. | ||
|
||
fn foo<K>(x: Option<K>) | ||
where Option<K> : Sized | ||
{ | ||
let _y = x; | ||
} | ||
|
||
fn main() { | ||
foo(Some(22)); | ||
} |
2b8678c
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 nick29581
at nikomatsakis@2b8678c
2b8678c
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/assoc-types-struct-field-access = 2b8678c into auto
2b8678c
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.
status: {"merge_sha": "4fc9b41238c5b8d36afd6765c770b6604bf7ef04"}
2b8678c
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/assoc-types-struct-field-access = 2b8678c merged ok, testing candidate = 4fc9b41
2b8678c
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.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3125
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3118
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3119
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3110
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/3110
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3113
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/3106
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/3101
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/2778
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2776
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/1614
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/1607
2b8678c
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.
fast-forwarding master to auto = 4fc9b41