-
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.
Rollup merge of #81911 - BoxyUwU:constgenericgaticefix, r=nikomatsakis
GAT/const_generics: Allow with_opt_const_param to return GAT param def_id Fixes #75415 Fixes #79666 cc ```@lcnr``` I've absolutely no idea who to r? for this...
- Loading branch information
Showing
5 changed files
with
139 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
22 changes: 22 additions & 0 deletions
22
src/test/ui/generic-associated-types/const-generics-gat-in-trait-return-type-1.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,22 @@ | ||
// run-pass | ||
#![feature(generic_associated_types)] | ||
#![allow(incomplete_features)] | ||
|
||
// This test unsures that with_opt_const_param returns the | ||
// def_id of the N param in the Foo::Assoc GAT. | ||
|
||
trait Foo { | ||
type Assoc<const N: usize>; | ||
fn foo(&self) -> Self::Assoc<3>; | ||
} | ||
|
||
impl Foo for () { | ||
type Assoc<const N: usize> = [(); N]; | ||
fn foo(&self) -> Self::Assoc<3> { | ||
[(); 3] | ||
} | ||
} | ||
|
||
fn main() { | ||
assert_eq!(().foo(), [(); 3]); | ||
} |
22 changes: 22 additions & 0 deletions
22
src/test/ui/generic-associated-types/const-generics-gat-in-trait-return-type-2.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,22 @@ | ||
// run-pass | ||
#![feature(generic_associated_types)] | ||
#![allow(incomplete_features)] | ||
|
||
// This test unsures that with_opt_const_param returns the | ||
// def_id of the N param in the Foo::Assoc GAT. | ||
|
||
trait Foo { | ||
type Assoc<const N: usize>; | ||
fn foo<const N: usize>(&self) -> Self::Assoc<N>; | ||
} | ||
|
||
impl Foo for () { | ||
type Assoc<const N: usize> = [(); N]; | ||
fn foo<const N: usize>(&self) -> Self::Assoc<N> { | ||
[(); N] | ||
} | ||
} | ||
|
||
fn main() { | ||
assert_eq!(().foo::<10>(), [(); 10]); | ||
} |
27 changes: 27 additions & 0 deletions
27
src/test/ui/generic-associated-types/const-generics-gat-in-trait-return-type-3.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,27 @@ | ||
// run-pass | ||
#![feature(generic_associated_types)] | ||
#![allow(incomplete_features)] | ||
|
||
// This test unsures that with_opt_const_param returns the | ||
// def_id of the N param in the Bar::Assoc GAT. | ||
|
||
trait Bar { | ||
type Assoc<const N: usize>; | ||
} | ||
trait Foo: Bar { | ||
fn foo(&self) -> Self::Assoc<3>; | ||
} | ||
|
||
impl Bar for () { | ||
type Assoc<const N: usize> = [(); N]; | ||
} | ||
|
||
impl Foo for () { | ||
fn foo(&self) -> Self::Assoc<3> { | ||
[(); 3] | ||
} | ||
} | ||
|
||
fn main() { | ||
assert_eq!(().foo(), [(); 3]); | ||
} |