Skip to content

Commit 31780d4

Browse files
committed
Auto merge of #138058 - jieyouxu:rollup-skdt0oz, r=jieyouxu
Rollup of 20 pull requests Successful merges: - #134063 (dec2flt: Clean up float parsing modules) - #136581 (Retire the legacy `Makefile`-based `run-make` test infra) - #136662 (Count char width at most once in `Formatter::pad`) - #136764 (Make `ptr_cast_add_auto_to_object` lint into hard error) - #136798 (Added documentation for flushing per #74348) - #136865 (Perform deeper compiletest path normalization for `$TEST_BUILD_DIR` to account for compare-mode/debugger cases, and normalize long type file filename hashes) - #136975 (Look for `python3` first on MacOS, not `py`) - #136977 (Upload Datadog metrics with citool) - #137240 (Slightly reformat `std::fs::remove_dir_all` error docs) - #137298 (Check signature WF when lowering MIR body) - #137463 ([illumos] attempt to use posix_spawn to spawn processes) - #137477 (uefi: Add Service Binding Protocol abstraction) - #137569 (Stabilize `string_extend_from_within`) - #137633 (Only use implied bounds hack if bevy, and use deeply normalize in implied bounds hack) - #137679 (Various coretests improvements) - #137723 (Make `rust.description` more general-purpose and pass `CFG_VER_DESCRIPTION`) - #137728 (Remove unsizing coercions for tuples) - #137731 (Resume one waiter at once in deadlock handler) - #137875 (mir_build: Integrate "simplification" steps into match-pair-tree creation) - #138028 (compiler: add `ExternAbi::is_rustic_abi`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b15d5f4 + 900887d commit 31780d4

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

tests/pass/unsized.rs

-15
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11
//@revisions: stack tree
22
//@[tree]compile-flags: -Zmiri-tree-borrows
3-
#![feature(unsized_tuple_coercion)]
43
#![feature(unsized_fn_params)]
54
#![feature(custom_mir, core_intrinsics)]
65

7-
use std::mem;
8-
9-
fn unsized_tuple() {
10-
let x: &(i32, i32, [i32]) = &(0, 1, [2, 3]);
11-
let y: &(i32, i32, [i32]) = &(0, 1, [2, 3, 4]);
12-
let mut a = [y, x];
13-
a.sort();
14-
assert_eq!(a, [x, y]);
15-
16-
assert_eq!(&format!("{:?}", a), "[(0, 1, [2, 3]), (0, 1, [2, 3, 4])]");
17-
assert_eq!(mem::size_of_val(x), 16);
18-
}
19-
206
fn unsized_params() {
217
pub fn f0(_f: dyn FnOnce()) {}
228
pub fn f1(_s: str) {}
@@ -56,7 +42,6 @@ fn unsized_field_projection() {
5642
}
5743

5844
fn main() {
59-
unsized_tuple();
6045
unsized_params();
6146
unsized_field_projection();
6247
}

0 commit comments

Comments
 (0)