-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rustc: check instantiability of fixed length vectors properly.
Previously, they were treated like ~[] and &[] (which can have length 0), but fixed length vectors are fixed length, i.e. we know at compile time if it's possible to have length zero (which is only for [T, .. 0]). Fixes #11659.
- Loading branch information
Showing
2 changed files
with
32 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
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,26 @@ | ||
// 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. | ||
|
||
// issue #11659, the compiler needs to know that a fixed length vector | ||
// always requires instantiable contents to instantiable itself | ||
// (unlike a ~[] vector which can have length zero). | ||
|
||
// ~ to avoid infinite size. | ||
struct Uninstantiable { //~ ERROR cannot be instantiated without an instance of itself | ||
p: ~[Uninstantiable, .. 1] | ||
} | ||
|
||
struct Instantiable { p: ~[Instantiable, .. 0] } | ||
|
||
|
||
fn main() { | ||
let _ = None::<Uninstantiable>; | ||
let _ = Instantiable { p: ~([]) }; | ||
} |
6f3c202
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 thestinger
at huonw@6f3c202
6f3c202
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 huonw/rust/fixed-length-instantiation = 6f3c202 into auto
6f3c202
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.
huonw/rust/fixed-length-instantiation = 6f3c202 merged ok, testing candidate = 60914db4
6f3c202
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-linux-32-nopt-t/builds/2787
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3678
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1520
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1522
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3679
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2779
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2785
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3693
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2781
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3695
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2781
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2786
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2855
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3685
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2786
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2791
exception: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3456
6f3c202
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 thestinger
at huonw@6f3c202
6f3c202
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 huonw/rust/fixed-length-instantiation = 6f3c202 into auto
6f3c202
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.
huonw/rust/fixed-length-instantiation = 6f3c202 merged ok, testing candidate = 02d4572
6f3c202
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/3679
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1521
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1523
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3680
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2780
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2786
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3694
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2782
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2788
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3696
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2782
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2787
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2856
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3686
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2787
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2792
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3457
6f3c202
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 = 02d4572