Manually walk into WF obligations in `BestObligation` proof tree visitor by compiler-errors · Pull Request #135900 · rust-lang/rust

compiler-errors · 2025-01-22T20:19:51Z

When we encounter a WellFormed obligation in the BestObligation proof tree visitor, ignore the proof tree and call wf::unnormalized_obligations to derive well-formed obligations with the correct cause codes. This is to avoid having to replicate the somewhat delicate logic that wf.rs does to set up its obligation causes... Don't see a better way to do this.

vibes?? r? lcnr

rustbot · 2025-01-22T20:20:01Z

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

changes to the core type system

cc @compiler-errors, @lcnr

bors · 2025-01-22T23:20:28Z

☔ The latest upstream changes (presumably #135893) made this pull request unmergeable. Please resolve the merge conflicts.

lcnr · 2025-01-28T11:42:38Z

compiler/rustc_trait_selection/src/solve/fulfill/derive_errors.rs

+                // HACK: We walk the nested obligations for a well-formed arg manually,
+                // since there's nontrivial logic in `wf.rs` to set up an obligation cause.
+                // Ideally we'd be able to track this better.


doc comment on visit_well_formed_goal instead

lcnr · 2025-01-28T11:44:20Z

compiler/rustc_trait_selection/src/solve/fulfill/derive_errors.rs

+            match self.consider_ambiguities {
+                true if matches!(
+                    nested_goal.result(),
+                    Ok(Certainty::Maybe(MaybeCause::Ambiguity))
+                ) => {}
+                false if matches!(nested_goal.result(), Err(_)) => {}
+                _ => continue,
+            }


match (self.condider_ambiguities, nested_goal.result())

lcnr

that's a fun solution 😁

r=me after nits

compiler-errors · 2025-01-29T00:27:15Z

@bors r=lcnr

bors · 2025-01-29T00:27:18Z

📌 Commit 5f76f1a has been approved by lcnr

It is now in the queue for this repository.

Manually walk into WF obligations in `BestObligation` proof tree visitor When we encounter a `WellFormed` obligation in the `BestObligation` proof tree visitor, ignore the proof tree and call `wf::unnormalized_obligations` to derive well-formed obligations with the correct cause codes. This is to avoid having to replicate the somewhat delicate logic that `wf.rs` does to set up its obligation causes... Don't see a better way to do this. vibes?? r? lcnr

fmease · 2025-01-29T02:03:03Z

@bors r-

compiler-errors · 2025-01-29T19:28:17Z

@bors r=lcnr

bors · 2025-01-29T19:28:20Z

📌 Commit 94ef5cf has been approved by lcnr

It is now in the queue for this repository.

Manually walk into WF obligations in `BestObligation` proof tree visitor When we encounter a `WellFormed` obligation in the `BestObligation` proof tree visitor, ignore the proof tree and call `wf::unnormalized_obligations` to derive well-formed obligations with the correct cause codes. This is to avoid having to replicate the somewhat delicate logic that `wf.rs` does to set up its obligation causes... Don't see a better way to do this. vibes?? r? lcnr

matthiaskrgr · 2025-01-30T04:58:42Z

failed locally in #136276 I think, may need rebase or something

---- [ui] tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.rs#next stdout ----
Saved the actual stderr to "/home/matthias/vcs/github/rust/build/x86_64-unknown-linux-gnu/test/ui/typeck/issue-114918/const-in-impl-fn-return-type.next/const-in-impl-fn-return-type.next.stderr"
diff of stderr:

9	   |
10	LL |     fn func<const N: u32>() -> [(); N];
11	   |                                ^^^^^^^ expected `usize`, found `u32`
+	   |
+	   = note: the length of array `[(); N]` must be type `usize`
12	
13	error: aborting due to 2 previous errors
14	


The actual stderr differed from the expected stderr.
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args typeck/issue-114918/const-in-impl-fn-return-type.rs`

error in revision `next`: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/home/matthias/vcs/github/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" "/home/matthias/vcs/github/rust/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/home/matthias/.cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/home/matthias/vcs/github/rust/vendor" "--sysroot" "/home/matthias/vcs/github/rust/build/x86_64-unknown-linux-gnu/stage1" "--target=x86_64-unknown-linux-gnu" "--cfg" "next" "--check-cfg" "cfg(test,FALSE,current,next)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/home/matthias/vcs/github/rust/build/x86_64-unknown-linux-gnu/test/ui/typeck/issue-114918/const-in-impl-fn-return-type.next" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/home/matthias/vcs/github/rust/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-Znext-solver"
stdout: none
--- stderr -------------------------------
error[E0308]: mismatched types
  --> /home/matthias/vcs/github/rust/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.rs:20:39
   |
LL |     fn func<const N: u32>() -> [(); { () }] {
   |                                       ^^ expected `usize`, found `()`

error: the constant `N` is not of type `usize`
  --> /home/matthias/vcs/github/rust/tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.rs:12:32
   |
LL |     fn func<const N: u32>() -> [(); N];
   |                                ^^^^^^^ expected `usize`, found `u32`
   |
   = note: the length of array `[(); N]` must be type `usize`

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0308`.
------------------------------------------



failures:
    [ui] tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.rs#next

test result: FAILED. 18207 passed; 1 failed; 181 ignored; 0 measured; 0 filtered out; finished in 353.09s

compiler-errors · 2025-01-30T05:05:39Z

ya needs rebase

@bors r-

bors · 2025-01-31T02:51:19Z

☔ The latest upstream changes (presumably #136318) made this pull request unmergeable. Please resolve the merge conflicts.

compiler-errors · 2025-01-31T18:22:17Z

@bors r=lcnr

bors · 2025-01-31T18:22:20Z

📌 Commit 304b3cf has been approved by lcnr

It is now in the queue for this repository.

Manually walk into WF obligations in `BestObligation` proof tree visitor When we encounter a `WellFormed` obligation in the `BestObligation` proof tree visitor, ignore the proof tree and call `wf::unnormalized_obligations` to derive well-formed obligations with the correct cause codes. This is to avoid having to replicate the somewhat delicate logic that `wf.rs` does to set up its obligation causes... Don't see a better way to do this. vibes?? r? lcnr

…kingjubilee Rollup of 16 pull requests Successful merges: - rust-lang#133266 (ci: fix explanation why LLVM download is disabled for windows-gnu) - rust-lang#135768 (tests: Port `symbol-mangling-hashed` to rmake.rs) - rust-lang#135836 (bootstrap: only build `crt{begin,end}.o` when compiling to MUSL) - rust-lang#135840 (omit unused args warnings for intrinsics without body) - rust-lang#135900 (Manually walk into WF obligations in `BestObligation` proof tree visitor) - rust-lang#136146 (Explicitly choose x86 softfloat/hardfloat ABI) - rust-lang#136154 (Use +secure-plt for powerpc-unknown-linux-gnu{,spe}) - rust-lang#136163 (Fix off-by-one error causing slice::sort to abort the program) - rust-lang#136266 (fix broken release notes id) - rust-lang#136283 (Update encode_utf16 to mention it is native endian) - rust-lang#136309 (set rustc dylib on manually constructed rustc command) - rust-lang#136314 (Use proper type when applying deref adjustment in const) - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets) - rust-lang#136348 (miri: make float min/max non-deterministic) - rust-lang#136351 (Add documentation for derive(CoercePointee)) - rust-lang#136358 (`#[optimize(none)]` implies `#[inline(never)]`) Failed merges: - rust-lang#135994 (Rename rustc_middle::Ty::is_unsafe_ptr to is_raw_ptr) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#135840 (omit unused args warnings for intrinsics without body) - rust-lang#135900 (Manually walk into WF obligations in `BestObligation` proof tree visitor) - rust-lang#136163 (Fix off-by-one error causing slice::sort to abort the program) - rust-lang#136266 (fix broken release notes id) - rust-lang#136314 (Use proper type when applying deref adjustment in const) - rust-lang#136348 (miri: make float min/max non-deterministic) - rust-lang#136351 (Add documentation for derive(CoercePointee)) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#135900 - compiler-errors:derive-wf, r=lcnr Manually walk into WF obligations in `BestObligation` proof tree visitor When we encounter a `WellFormed` obligation in the `BestObligation` proof tree visitor, ignore the proof tree and call `wf::unnormalized_obligations` to derive well-formed obligations with the correct cause codes. This is to avoid having to replicate the somewhat delicate logic that `wf.rs` does to set up its obligation causes... Don't see a better way to do this. vibes?? r? lcnr

rustbot assigned lcnr Jan 22, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 22, 2025

rustbot added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Jan 22, 2025

lcnr reviewed Jan 28, 2025

View reviewed changes

compiler-errors force-pushed the derive-wf branch 2 times, most recently from 3568624 to 5f76f1a Compare January 29, 2025 00:27

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 29, 2025

This comment has been minimized.

Sign in to view

Zalathar mentioned this pull request Jan 29, 2025

Rollup of 8 pull requests #136222

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 29, 2025

compiler-errors force-pushed the derive-wf branch from 5f76f1a to 94ef5cf Compare January 29, 2025 16:08

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 29, 2025

matthiaskrgr mentioned this pull request Jan 30, 2025

Rollup of 7 pull requests #136276

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 30, 2025

compiler-errors added 2 commits January 31, 2025 18:16

Move fulfillment error derivation into new module

d8b176f

Manually walk into WF obligations in BestObligation proof tree visitor

304b3cf

compiler-errors force-pushed the derive-wf branch from 94ef5cf to 304b3cf Compare January 31, 2025 18:22

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 31, 2025

workingjubilee mentioned this pull request Jan 31, 2025

Rollup of 16 pull requests #136367

Closed

matthiaskrgr mentioned this pull request Feb 1, 2025

Rollup of 7 pull requests #136371

Merged

bors merged commit 3c4b912 into rust-lang:master Feb 1, 2025
6 checks passed

rustbot added this to the 1.86.0 milestone Feb 1, 2025

Uh oh!

Conversation

compiler-errors commented Jan 22, 2025

Uh oh!

rustbot commented Jan 22, 2025

Uh oh!

bors commented Jan 22, 2025

Uh oh!

lcnr Jan 28, 2025

Choose a reason for hiding this comment

Uh oh!

lcnr Jan 28, 2025

Choose a reason for hiding this comment

Uh oh!

lcnr left a comment

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Jan 29, 2025

Uh oh!

bors commented Jan 29, 2025

Uh oh!

This comment has been minimized.

fmease commented Jan 29, 2025

Uh oh!

compiler-errors commented Jan 29, 2025

Uh oh!

bors commented Jan 29, 2025

Uh oh!

matthiaskrgr commented Jan 30, 2025

Uh oh!

compiler-errors commented Jan 30, 2025

Uh oh!

bors commented Jan 31, 2025

Uh oh!

compiler-errors commented Jan 31, 2025

Uh oh!

bors commented Jan 31, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants