merge opaque types defined in nested bodies #138719

lcnr · 2025-03-19T16:53:38Z

A small step towards rust-lang/types-team#129

rustbot · 2025-03-19T16:53:44Z

This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.

lcnr · 2025-03-19T16:54:01Z

compiler/rustc_hir_analysis/src/collect/type_of/opaque.rs

@@ -395,9 +386,6 @@ impl<'tcx> intravisit::Visitor<'tcx> for RpitConstraintChecker<'tcx> {
        self.tcx
    }
    fn visit_expr(&mut self, ex: &'tcx Expr<'tcx>) {
-        if let hir::ExprKind::Closure(closure) = ex.kind {


this was previously incorrect as we'd have also looked into inline constants :<

oli-obk · 2025-03-20T14:39:57Z

@bors r+ rollup=never (possibly perf sentsitive)

bors · 2025-03-20T14:39:59Z

📌 Commit cfc78ce has been approved by oli-obk

It is now in the queue for this repository.

add `TypingMode::Borrowck` Still not quite ready Based on rust-lang#138492 and rust-lang#138719 r? `@compiler-errors` `@oli-obk`

bors · 2025-03-22T06:55:55Z

⌛ Testing commit cfc78ce with merge db68788...

bors · 2025-03-22T10:01:59Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing db68788 to master...

github-actions · 2025-03-22T10:04:02Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 2a1c8be (parent) -> db68788 (this PR)

Test differences

Show 32937 test diffs

back::rpath::tests::test_minimize1 (stage 2): pass -> [missing] (J0)
bit_set::tests::sparse_matrix_operations (stage 1): [missing] -> pass (J0)
deriving::coerce_pointee::verify_builtin_macros_coerce_pointee_requires_one_generic_2 (stage 2): pass -> [missing] (J0)
errors::verify_codegen_ssa_compiler_builtins_cannot_call_141 (stage 1): [missing] -> pass (J0)
errors::verify_codegen_ssa_read_file_80 (stage 1): [missing] -> pass (J0)
errors::verify_codegen_ssa_read_file_80 (stage 2): pass -> [missing] (J0)
errors::verify_expand_macro_const_stability_8 (stage 1): [missing] -> pass (J0)
errors::verify_incremental_assertion_auto_5 (stage 2): pass -> [missing] (J0)
errors::verify_metadata_fail_create_file_encoder_40 (stage 2): pass -> [missing] (J0)
errors::verify_monomorphize_unknown_cgu_collection_mode_7 (stage 1): [missing] -> pass (J0)
errors::verify_parse_enum_pattern_instead_of_identifier_114 (stage 1): [missing] -> pass (J0)
errors::verify_parse_self_param_not_first_49 (stage 1): [missing] -> pass (J0)
errors::verify_passes_incorrect_target_141 (stage 1): [missing] -> pass (J0)
errors::verify_passes_layout_invalid_attribute_120 (stage 2): pass -> [missing] (J0)
errors::verify_passes_linkage_90 (stage 1): [missing] -> pass (J0)
errors::verify_passes_naked_asm_outside_naked_fn_137 (stage 2): pass -> [missing] (J0)
errors::verify_passes_unused_multiple_101 (stage 2): pass -> [missing] (J0)
format_foreign::shell::tests::test_translation (stage 2): pass -> [missing] (J0)
hir::tests::cast_never (stage 2): pass -> [missing] (J0)
html::length_limit::tests::forgot_to_close_tags (stage 1): [missing] -> pass (J0)
interval::tests::last_set_before_adjacent (stage 1): [missing] -> pass (J0)
lints::verify_lint_builtin_export_name_static_15 (stage 2): pass -> [missing] (J0)
lints::verify_lint_map_unit_fn_50 (stage 1): [missing] -> pass (J0)
opaque::tests::test_u64 (stage 1): [missing] -> pass (J0)
session_diagnostics::verify_borrowck_tail_expr_drop_order_9 (stage 2): pass -> [missing] (J0)
source_map::tests::t9 (stage 2): pass -> [missing] (J0)
spec::tests::aarch64_unknown_none (stage 2): pass -> [missing] (J0)
spec::tests::armv7_sony_vita_newlibeabihf (stage 2): pass -> [missing] (J0)
spec::tests::hexagon_unknown_linux_musl (stage 1): [missing] -> pass (J0)
spec::tests::i386_apple_ios (stage 1): [missing] -> pass (J0)
spec::tests::riscv32imc_unknown_nuttx_elf (stage 2): pass -> [missing] (J0)
ascii::is_ascii::unaligned_tail_medium::case02_align_to (stage 2): pass -> [missing] (J1)
iter::bench_cycle_skip_take_sum (stage 1): [missing] -> pass (J1)
iter::bench_next_chunk_filter_map_predictably_true (stage 1): [missing] -> pass (J1)
iter::bench_take_while_chain_sum (stage 2): pass -> [missing] (J1)
num::int_log::u32_log_geometric (stage 1): [missing] -> pass (J1)
os::unix::net::tests::test_connect_unix_datagram (stage 2): pass -> [missing] (J1)
pattern::starts_with_char (stage 1): [missing] -> pass (J1)
slice::starts_with_diff_one_element_at_end (stage 1): [missing] -> pass (J1)
sort::tests::stable::correct_string_descending (stage 2): pass -> [missing] (J1)
sort::tests::stable::self_cmp_string_saw_mixed (stage 2): pass -> [missing] (J1)
sort::tests::unstable::correct_u64_random_s95 (stage 1): [missing] -> pass (J1)
vec::bench_in_place_xu32_0100_i0 (stage 1): [missing] -> pass (J1)
vec::bench_in_place_xxu8_0100_i0 (stage 1): [missing] -> pass (J1)
vec::bench_in_place_zip_iter_mut (stage 1): [missing] -> pass (J1)
ascii_char::test_display (stage 1): [missing] -> pass (J2)
c_str2::formatted (stage 2): pass -> [missing] (J2)
cell::ref_clone_updates_flag (stage 2): pass -> [missing] (J2)
cmp::test_ordering_reverse (stage 2): pass -> [missing] (J2)
collections::btree::map::tests::test_extract_if::height_1_removing_one (stage 1): [missing] -> pass (J2)
collections::btree::set::tests::test_difference_size_hint (stage 1): [missing] -> pass (J2)
f32::test_atanh (stage 1): [missing] -> pass (J2)
intrinsics::test_three_way_compare_in_const_contexts (stage 1): [missing] -> pass (J2)
io::cursor::tests::test_box_slice_writer (stage 2): pass -> [missing] (J2)
io::stdio::tests::stderr_unwind_safe (stage 1): [missing] -> pass (J2)
iter::adapters::peekable::test_peek_try_folds (stage 1): [missing] -> pass (J2)
iter::sources::test_repeat_take (stage 1): [missing] -> pass (J2)
iter::traits::accum::test_iterator_product_result (stage 2): pass -> [missing] (J2)
lazy::lazy_force_mut (stage 2): pass -> [missing] (J2)
lazy_lock::static_sync_lazy (stage 1): [missing] -> pass (J2)
mutex::test_replace_poison (stage 2): pass -> [missing] (J2)
net::socket_addr::compare (stage 2): pass -> [missing] (J2)
nonzero::test_nonzero_uint_div (stage 2): pass -> [missing] (J2)
num::bignum::test_from_u64_overflow (stage 2): pass -> [missing] (J2)
num::i128::test_checked_next_multiple_of (stage 2): pass -> [missing] (J2)
num::i128::test_saturating_neg (stage 1): [missing] -> pass (J2)
num::i32::test_saturating_abs (stage 1): [missing] -> pass (J2)
num::i8::test_carrying_mul_add (stage 1): [missing] -> pass (J2)
num::i8::test_rem_euclid (stage 1): [missing] -> pass (J2)
num::test_try_i8i8 (stage 1): [missing] -> pass (J2)
num::test_try_isizeu128 (stage 2): pass -> [missing] (J2)
num::u128::test_carrying_mul_add (stage 1): [missing] -> pass (J2)
num::u128::test_num (stage 2): pass -> [missing] (J2)
num::u8::test_parse_bytes (stage 1): [missing] -> pass (J2)
pattern::test_simple_search (stage 2): pass -> [missing] (J2)
result::test_try (stage 1): [missing] -> pass (J2)
slice::memchr::matches_one_reversed (stage 1): [missing] -> pass (J2)
slice::split_off_in_bounds_range_to_inclusive (stage 1): [missing] -> pass (J2)
slice::swap_panics::index_b_equals_len (stage 1): [missing] -> pass (J2)
slice::test_array_chunks_mut_infer (stage 2): pass -> [missing] (J2)
slice::test_copy_from_slice_dst_longer (stage 1): [missing] -> pass (J2)
slice::test_iter_ref_consistency (stage 2): pass -> [missing] (J2)
slice::test_slice_fill_with_uninit (stage 1): [missing] -> pass (J2)
sort::tests::stable::fixed_seed (stage 1): [missing] -> pass (J2)
str::slice_index::boundary::rangeinclusive_1::index_mut_fail (stage 2): pass -> [missing] (J2)
str::slice_index::rangeto_len::pass (stage 2): pass -> [missing] (J2)
string::test_str_clear (stage 2): pass -> [missing] (J2)
sync::test_maybe_thin_unsized (stage 1): [missing] -> pass (J2)
sys_common::wtf8::tests::wtf8_make_ascii_uppercase (stage 1): [missing] -> pass (J2)
sys_common::wtf8::tests::wtf8buf_push_str (stage 2): pass -> [missing] (J2)
sys_common::wtf8::tests::wtf8buf_show_str (stage 1): [missing] -> pass (J2)
thin_box::align2zst (stage 1): [missing] -> pass (J2)
vec::test_extend_from_slice (stage 2): pass -> [missing] (J2)
vec::test_flatten_clone (stage 2): pass -> [missing] (J2)
vec::test_indexing (stage 1): [missing] -> pass (J2)
sort::tests::stable::correct_i32_random_z2 (stage 1): [missing] -> ignore (J3)
sort::tests::stable::stability_i32_random_d20 (stage 1): [missing] -> ignore (J3)
sort::tests::stable::stability_string_random_d20 (stage 2): ignore -> [missing] (J3)
sort::tests::unstable::self_cmp_string_random_d20 (stage 1): [missing] -> ignore (J3)
f16::test_ceil (stage 1): [missing] -> pass (J4)

(and 16362 additional test diffs)

Additionally, 16475 doctest diffs were found. These are ignored, as they are noisy.

Job group index

J0: aarch64-apple, x86_64-apple-1
J1: aarch64-apple, test-various, x86_64-apple-1
J2: aarch64-apple, test-various, x86_64-apple-1, x86_64-gnu-aux
J3: x86_64-gnu-aux
J4: aarch64-apple

rust-timer · 2025-03-22T11:19:16Z

Finished benchmarking commit (db68788): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 4.4%, secondary -3.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	4.4%	[4.4%, 4.4%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.9%	[-3.9%, -3.9%]	1
All ❌✅ (primary)	4.4%	[4.4%, 4.4%]	1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 775.898s -> 775.231s (-0.09%)
Artifact size: 365.56 MiB -> 365.57 MiB (0.00%)

lcnr added 2 commits March 19, 2025 17:32

remove unnecessary loop

f8fe978

merge opaque types of nested bodies

cfc78ce

rustbot assigned oli-obk Mar 19, 2025

rustbot added S-waiting-on-review T-compiler labels Mar 19, 2025

lcnr commented Mar 19, 2025

View reviewed changes

bors added S-waiting-on-bors and removed S-waiting-on-review labels Mar 20, 2025

lcnr mentioned this pull request Mar 21, 2025

add TypingMode::Borrowck #138785

Draft

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2025

Auto merge of rust-lang#138785 - lcnr:typing-mode-borrowck, r=<try>

7139b88

add `TypingMode::Borrowck` Still not quite ready Based on rust-lang#138492 and rust-lang#138719 r? `@compiler-errors` `@oli-obk`

bors added the merged-by-bors label Mar 22, 2025

bors merged commit db68788 into rust-lang:master Mar 22, 2025
7 checks passed

rustbot added this to the 1.87.0 milestone Mar 22, 2025

This was referenced Mar 22, 2025

Split elided_lifetime_in_paths into tied and untied #120808

Draft

Remove placeholders completely #130227

Open

borrowck typeck children together with their root #138499

Draft

Add a new mismatched-lifetime-syntaxes lint #138677

Open

lcnr deleted the concrete_opaque_types-closures branch March 22, 2025 15:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge opaque types defined in nested bodies #138719

merge opaque types defined in nested bodies #138719

lcnr commented Mar 19, 2025

rustbot commented Mar 19, 2025

lcnr Mar 19, 2025

oli-obk commented Mar 20, 2025

bors commented Mar 20, 2025

bors commented Mar 22, 2025

bors commented Mar 22, 2025

github-actions bot commented Mar 22, 2025

rust-timer commented Mar 22, 2025

merge opaque types defined in nested bodies #138719

merge opaque types defined in nested bodies #138719

Conversation

lcnr commented Mar 19, 2025

rustbot commented Mar 19, 2025

lcnr Mar 19, 2025

Choose a reason for hiding this comment

oli-obk commented Mar 20, 2025

bors commented Mar 20, 2025

bors commented Mar 22, 2025

bors commented Mar 22, 2025

github-actions bot commented Mar 22, 2025

Test differences

rust-timer commented Mar 22, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size