Skip to content

Clean UI tests 2 of n #138639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/tools/tidy/src/issues.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2000,7 +2000,6 @@ ui/issues/issue-28586.rs
ui/issues/issue-28600.rs
ui/issues/issue-28625.rs
ui/issues/issue-28776.rs
ui/issues/issue-28777.rs
ui/issues/issue-28828.rs
ui/issues/issue-28839.rs
ui/issues/issue-28936.rs
Expand Down Expand Up @@ -2063,7 +2062,6 @@ ui/issues/issue-3091.rs
ui/issues/issue-31011.rs
ui/issues/issue-3109.rs
ui/issues/issue-3121.rs
ui/issues/issue-31260.rs
ui/issues/issue-31267-additional.rs
ui/issues/issue-31267.rs
ui/issues/issue-31299.rs
Expand Down Expand Up @@ -2608,7 +2606,6 @@ ui/issues/issue-9243.rs
ui/issues/issue-9249.rs
ui/issues/issue-9259.rs
ui/issues/issue-92741.rs
ui/issues/issue-9382.rs
ui/issues/issue-9446.rs
ui/issues/issue-9719.rs
ui/issues/issue-9725.rs
Expand Down
2 changes: 1 addition & 1 deletion src/tools/tidy/src/ui_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use ignore::Walk;
const ENTRY_LIMIT: u32 = 901;
// FIXME: The following limits should be reduced eventually.

const ISSUES_ENTRY_LIMIT: u32 = 1634;
const ISSUES_ENTRY_LIMIT: u32 = 1631;

const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
"rs", // test source files
Expand Down
20 changes: 20 additions & 0 deletions tests/ui/coercion/struct-coerce-vec-to-slice.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//! Regression test that ensures struct field literals can be coerced into slice and `Box` types
//@ check-pass

struct Thing1<'a> {
baz: &'a [Box<isize>],
bar: Box<u64>,
}

struct Thing2<'a> {
baz: &'a [Box<isize>],
bar: u64,
}

pub fn main() {
let _a = Thing1 { baz: &[], bar: Box::new(32) };
let _b = Thing1 { baz: &Vec::new(), bar: Box::new(32) };
let _c = Thing2 { baz: &[], bar: 32 };
let _d = Thing2 { baz: &Vec::new(), bar: 32 };
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//! Regression test to check that literal expressions in a struct field can be coerced to the
//! expected field type, including block expressions.
//!
//! Issue: <https://github.com/rust-lang/rust/issues/31260>

//@ check-pass

pub struct Struct<K: 'static> {
pub field: K,
}

static STRUCT: Struct<&'static [u8]> = Struct { field: { &[1] } };

static STRUCT2: Struct<&'static [u8]> = Struct { field: &[1] };

fn main() {}
22 changes: 0 additions & 22 deletions tests/ui/issues/issue-28777.rs

This file was deleted.

15 changes: 0 additions & 15 deletions tests/ui/issues/issue-31260.rs

This file was deleted.

37 changes: 0 additions & 37 deletions tests/ui/issues/issue-9382.rs

This file was deleted.

28 changes: 28 additions & 0 deletions tests/ui/parser/operator-precedence-braces-exprs.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//! Regression test for ensuring that operator precedence is correctly handled in the presence of
//! braces
//!
//! Issue: <https://github.com/rust-lang/rust/issues/28777>

//@ run-pass

#[allow(unused_braces)]
fn main() {
let v1 = { 1 + { 2 } * { 3 } };
let v2 = 1 + { 2 } * { 3 };

assert_eq!(7, v1);
assert_eq!(7, v2);

let v3;
v3 = { 1 + { 2 } * { 3 } };
let v4;
v4 = 1 + { 2 } * { 3 };
assert_eq!(7, v3);
assert_eq!(7, v4);

let v5 = { 1 + { 2 } * 3 };
assert_eq!(7, v5);

let v9 = { 1 + if 1 > 2 { 1 } else { 2 } * { 3 } };
assert_eq!(7, v9);
}
Loading