Auto merge of #25091 - quantheory:trait_associated_const_fixes, r=nikomatsakis
Closes #25046 (by rejecting the code that causes the ICE) and #24946. I haven't been able to deal with the array size or recursion issues yet for associated consts, though my hope was that the change I made for range match patterns might help with array sizes, too. This PR is pretty much orthogonal to #25065.
This commit is contained in:
commit
0ea80faae8
7 changed files with 133 additions and 15 deletions
26
src/test/compile-fail/associated-const-type-parameters.rs
Normal file
26
src/test/compile-fail/associated-const-type-parameters.rs
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
// 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.
|
||||
|
||||
#![feature(associated_consts)]
|
||||
|
||||
pub trait Foo {
|
||||
const MIN: i32;
|
||||
|
||||
fn get_min() -> i32 {
|
||||
Self::MIN //~ ERROR E0329
|
||||
}
|
||||
}
|
||||
|
||||
fn get_min<T: Foo>() -> i32 {
|
||||
T::MIN; //~ ERROR E0329
|
||||
<T as Foo>::MIN //~ ERROR E0329
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
35
src/test/run-pass/associated-const-range-match-patterns.rs
Normal file
35
src/test/run-pass/associated-const-range-match-patterns.rs
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
// 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.
|
||||
|
||||
#![feature(associated_consts)]
|
||||
|
||||
struct Foo;
|
||||
|
||||
trait HasNum {
|
||||
const NUM: isize;
|
||||
}
|
||||
impl HasNum for Foo {
|
||||
const NUM: isize = 1;
|
||||
}
|
||||
|
||||
fn main() {
|
||||
assert!(match 2 {
|
||||
Foo::NUM ... 3 => true,
|
||||
_ => false,
|
||||
});
|
||||
assert!(match 0 {
|
||||
-1 ... <Foo as HasNum>::NUM => true,
|
||||
_ => false,
|
||||
});
|
||||
assert!(match 1 {
|
||||
<Foo as HasNum>::NUM ... <Foo>::NUM => true,
|
||||
_ => false,
|
||||
});
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue