Skip to content

Commit e5b68e3

Browse files
authored
Unrolled build for #149922
Rollup merge of #149922 - reddevilmidzy:t12, r=Kivooeo Tidying up tests/ui/issues 14 tests [5/N] > [!NOTE] > Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge. part of #133895 move `tests/ui/inherent-impls-overlap-check` to `tests/ui/duplicate/inherent-impls-overlap-check`. r? Kivooeo
2 parents f794a08 + bf92214 commit e5b68e3

24 files changed

+65
-59
lines changed

tests/ui/README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -709,12 +709,6 @@ Tests on type inference.
709709

710710
Tests for diagnostics on infinitely recursive types without indirection.
711711

712-
## `tests/ui/inherent-impls-overlap-check/`
713-
714-
Checks that repeating the same function names across separate `impl` blocks triggers an informative error, but not if the `impl` are for different types, such as `Bar<u8>` and `Bar<u16>`.
715-
716-
NOTE: This should maybe be a subdirectory within another related to duplicate definitions, such as `tests/ui/duplicate/`.
717-
718712
## `tests/ui/inline-const/`
719713

720714
These tests revolve around the inline `const` block that forces the compiler to const-eval its content.

tests/ui/issues/issue-34074.rs renamed to tests/ui/anon-params/anon-params-trait-method-multiple.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//! regression test for <https://github.com/rust-lang/rust/issues/34074>
12
//@ edition: 2015
23
//@ check-pass
34
// Make sure several unnamed function parameters don't conflict with each other
@@ -7,5 +8,4 @@ trait Tr {
78
fn f(u8, u8) {}
89
}
910

10-
fn main() {
11-
}
11+
fn main() {}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//! regression test for <https://github.com/rust-lang/rust/issues/21306>
2+
//@ run-pass
3+
4+
use std::sync::Arc;
5+
6+
fn main() {
7+
let x = 5;
8+
let command = Arc::new(Box::new(|| x * 2));
9+
assert_eq!(command(), 10);
10+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
//! regression test for <https://github.com/rust-lang/rust/issues/27268>
2+
//@ run-pass
3+
fn main() {
4+
const _C: &'static dyn Fn() = &|| {};
5+
}

tests/ui/inherent-impls-overlap-check/auxiliary/repeat.rs renamed to tests/ui/duplicate/inherent-impls-overlap-check/auxiliary/repeat.rs

File renamed without changes.

tests/ui/issues/issue-19097.rs renamed to tests/ui/duplicate/inherent-impls-overlap-check/disjoint-ref-mut-method.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
//! regression test for <https://github.com/rust-lang/rust/issues/19097>
12
//@ check-pass
23
#![allow(dead_code)]
3-
// regression test for #19097
44

55
struct Foo<T>(T);
66

tests/ui/inherent-impls-overlap-check/no-overlap.rs renamed to tests/ui/duplicate/inherent-impls-overlap-check/no-overlap.rs

File renamed without changes.
File renamed without changes.

tests/ui/inherent-impls-overlap-check/overlap.stderr renamed to tests/ui/duplicate/inherent-impls-overlap-check/overlap.stderr

File renamed without changes.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
//! regression test for <https://github.com/rust-lang/rust/issues/24161>
12
//@ check-pass
23
#![allow(dead_code)]
3-
#[derive(Copy,Clone)]
4+
#[derive(Copy, Clone)]
45
struct Functions {
56
a: fn(u32) -> u32,
67
b: extern "C" fn(u32) -> u32,
78
c: unsafe fn(u32) -> u32,
8-
d: unsafe extern "C" fn(u32) -> u32
9+
d: unsafe extern "C" fn(u32) -> u32,
910
}
1011

1112
pub fn main() {}

0 commit comments

Comments
 (0)