diff options
| author | bors <bors@rust-lang.org> | 2021-03-27 16:34:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-27 16:34:59 +0000 |
| commit | afaf33dcafe9c7068b63eb997df221aa08db7c29 (patch) | |
| tree | 2bd2416c2a6dcbdf410e6d9f932960b124cb576a /src/test/ui | |
| parent | 101003881418d23fee3fcb1b1721a216a366f2da (diff) | |
| parent | 1ad7c52812b336c23d86bc4c74c408fe5c850761 (diff) | |
| download | rust-afaf33dcafe9c7068b63eb997df221aa08db7c29.tar.gz rust-afaf33dcafe9c7068b63eb997df221aa08db7c29.zip | |
Auto merge of #83573 - JohnTitor:rollup-28jnzsr, r=JohnTitor
Rollup of 10 pull requests
Successful merges:
- #79399 (Use detailed and shorter fs error explaination)
- #83348 (format macro argument parsing fix)
- #83462 (ExitStatus: print "exit status: {}" rather than "exit code: {}" on unix)
- #83526 (lazily calls some fns)
- #83558 (Use DebugStruct::finish_non_exhaustive() in std.)
- #83559 (Fix Debug implementation for RwLock{Read,Write}Guard.)
- #83560 (Derive Debug for io::Chain instead of manually implementing it.)
- #83561 (Improve Debug implementations of Mutex and RwLock.)
- #83567 (Update rustup cross-compilation docs link)
- #83569 (Add regression tests for #56445)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/ui')
| -rw-r--r-- | src/test/ui/const-generics/issues/issue-56445-1.full.stderr (renamed from src/test/ui/const-generics/issues/issue-56445.full.stderr) | 4 | ||||
| -rw-r--r-- | src/test/ui/const-generics/issues/issue-56445-1.min.stderr (renamed from src/test/ui/const-generics/issues/issue-56445.min.stderr) | 2 | ||||
| -rw-r--r-- | src/test/ui/const-generics/issues/issue-56445-1.rs (renamed from src/test/ui/const-generics/issues/issue-56445.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/const-generics/issues/issue-56445-2.rs | 11 | ||||
| -rw-r--r-- | src/test/ui/const-generics/issues/issue-56445-2.stderr | 14 | ||||
| -rw-r--r-- | src/test/ui/const-generics/issues/issue-56445-3.rs | 12 | ||||
| -rw-r--r-- | src/test/ui/const-generics/issues/issue-56445-3.stderr | 8 | ||||
| -rw-r--r-- | src/test/ui/macros/issue-83344.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/macros/issue-83344.stderr | 8 |
9 files changed, 62 insertions, 3 deletions
diff --git a/src/test/ui/const-generics/issues/issue-56445.full.stderr b/src/test/ui/const-generics/issues/issue-56445-1.full.stderr index 61fba92c196..8416d64e1c2 100644 --- a/src/test/ui/const-generics/issues/issue-56445.full.stderr +++ b/src/test/ui/const-generics/issues/issue-56445-1.full.stderr @@ -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))] | ^^^^^^^^^^^^^^ @@ -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 ()>); | ^^ diff --git a/src/test/ui/const-generics/issues/issue-56445.min.stderr b/src/test/ui/const-generics/issues/issue-56445-1.min.stderr index 80702dd4bc3..f7056f27cb3 100644 --- a/src/test/ui/const-generics/issues/issue-56445.min.stderr +++ b/src/test/ui/const-generics/issues/issue-56445-1.min.stderr @@ -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 ()>); | ^^ diff --git a/src/test/ui/const-generics/issues/issue-56445.rs b/src/test/ui/const-generics/issues/issue-56445-1.rs index bc9e1dee853..bc9e1dee853 100644 --- a/src/test/ui/const-generics/issues/issue-56445.rs +++ b/src/test/ui/const-generics/issues/issue-56445-1.rs diff --git a/src/test/ui/const-generics/issues/issue-56445-2.rs b/src/test/ui/const-generics/issues/issue-56445-2.rs new file mode 100644 index 00000000000..e078c8487c7 --- /dev/null +++ b/src/test/ui/const-generics/issues/issue-56445-2.rs @@ -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() {} diff --git a/src/test/ui/const-generics/issues/issue-56445-2.stderr b/src/test/ui/const-generics/issues/issue-56445-2.stderr new file mode 100644 index 00000000000..770c80cbbd3 --- /dev/null +++ b/src/test/ui/const-generics/issues/issue-56445-2.stderr @@ -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 + diff --git a/src/test/ui/const-generics/issues/issue-56445-3.rs b/src/test/ui/const-generics/issues/issue-56445-3.rs new file mode 100644 index 00000000000..c29df14586e --- /dev/null +++ b/src/test/ui/const-generics/issues/issue-56445-3.rs @@ -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() {} diff --git a/src/test/ui/const-generics/issues/issue-56445-3.stderr b/src/test/ui/const-generics/issues/issue-56445-3.stderr new file mode 100644 index 00000000000..f1c49eecfb5 --- /dev/null +++ b/src/test/ui/const-generics/issues/issue-56445-3.stderr @@ -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 + diff --git a/src/test/ui/macros/issue-83344.rs b/src/test/ui/macros/issue-83344.rs new file mode 100644 index 00000000000..c5f7f723587 --- /dev/null +++ b/src/test/ui/macros/issue-83344.rs @@ -0,0 +1,6 @@ +// check-fail + +fn main() { + println!("{}\ +"); //~^ ERROR: 1 positional argument in format string, but no arguments were given +} diff --git a/src/test/ui/macros/issue-83344.stderr b/src/test/ui/macros/issue-83344.stderr new file mode 100644 index 00000000000..1ef70f87a1f --- /dev/null +++ b/src/test/ui/macros/issue-83344.stderr @@ -0,0 +1,8 @@ +error: 1 positional argument in format string, but no arguments were given + --> $DIR/issue-83344.rs:4:15 + | +LL | println!("{}\ + | ^^ + +error: aborting due to previous error + |
