Skip to content

Commit

Permalink
Rollup merge of rust-lang#83569 - sjakobi:issue56445-regression-test,…
Browse files Browse the repository at this point in the history
… r=jackh726

Add regression tests for rust-lang#56445

Closes rust-lang#56445.
  • Loading branch information
JohnTitor authored Mar 27, 2021
2 parents 69acaf3 + 0927580 commit 1ad7c52
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
warning: the feature `const_generics` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/issue-56445.rs:3:27
--> $DIR/issue-56445-1.rs:3:27
|
LL | #![cfg_attr(full, feature(const_generics))]
| ^^^^^^^^^^^^^^
Expand All @@ -8,7 +8,7 @@ LL | #![cfg_attr(full, feature(const_generics))]
= note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information

error[E0771]: use of non-static lifetime `'a` in const generic
--> $DIR/issue-56445.rs:8:26
--> $DIR/issue-56445-1.rs:8:26
|
LL | struct Bug<'a, const S: &'a str>(PhantomData<&'a ()>);
| ^^
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0771]: use of non-static lifetime `'a` in const generic
--> $DIR/issue-56445.rs:8:26
--> $DIR/issue-56445-1.rs:8:26
|
LL | struct Bug<'a, const S: &'a str>(PhantomData<&'a ()>);
| ^^
Expand Down
11 changes: 11 additions & 0 deletions src/test/ui/const-generics/issues/issue-56445-2.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Regression test for https://github.com/rust-lang/rust/issues/56445#issuecomment-502095133
struct OnDiskDirEntry<'a> { _s: &'a usize }

impl<'a> OnDiskDirEntry<'a> {
const LFN_FRAGMENT_LEN: usize = 2;

fn lfn_contents(&self) -> [char; Self::LFN_FRAGMENT_LEN] { loop { } }
//~^ ERROR: generic `Self` types are currently not permitted in anonymous constants
}

fn main() {}
14 changes: 14 additions & 0 deletions src/test/ui/const-generics/issues/issue-56445-2.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: generic `Self` types are currently not permitted in anonymous constants
--> $DIR/issue-56445-2.rs:7:38
|
LL | fn lfn_contents(&self) -> [char; Self::LFN_FRAGMENT_LEN] { loop { } }
| ^^^^
|
note: not a concrete type
--> $DIR/issue-56445-2.rs:4:10
|
LL | impl<'a> OnDiskDirEntry<'a> {
| ^^^^^^^^^^^^^^^^^^

error: aborting due to previous error

12 changes: 12 additions & 0 deletions src/test/ui/const-generics/issues/issue-56445-3.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Regression test for https://github.com/rust-lang/rust/issues/56445#issuecomment-524494170
pub struct Memory<'rom> {
rom: &'rom [u8],
ram: [u8; Self::SIZE],
//~^ ERROR: generic `Self` types are currently not permitted in anonymous constants
}

impl<'rom> Memory<'rom> {
pub const SIZE: usize = 0x8000;
}

fn main() {}
8 changes: 8 additions & 0 deletions src/test/ui/const-generics/issues/issue-56445-3.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
error: generic `Self` types are currently not permitted in anonymous constants
--> $DIR/issue-56445-3.rs:4:15
|
LL | ram: [u8; Self::SIZE],
| ^^^^

error: aborting due to previous error

0 comments on commit 1ad7c52

Please sign in to comment.