Skip to content

Rollup of 19 pull requests #139508

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

Closed
wants to merge 52 commits into from
Closed

Conversation

Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Apr 8, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

xtexx and others added 30 commits April 3, 2025 17:35
Fixes rust-lang#139082.

Emits an error when `Self` is found in the projection bounds of a trait
object. In type aliases, `Self` has no meaning, so `type A = &'static
dyn B` where `trait B = Fn() -> Self` will expands to `type A = &'static
Fn() -> Self` which is illegal, causing the region solver to bail out
when hitting the uninferred Self.

Bug: rust-lang#139082
Signed-off-by: xtex <[email protected]>
Signed-off-by: onur-ozkan <[email protected]>
we already track this info in the `definitions` field
It was supposed to be like this from the start, but I forgot to apply the `abs` operation, as I got sidetracked with how to actually compare floats...
This should make it much easier to investigate the individual job changes.
Those that didn't previously preserved kind are now marked as not requiring annotations to keep the previous behavior.

Also, do not lose diagnostics with an empty message.
This catches some silly notes emitted by rustc, which should ideally be fixed
@rustbot rustbot added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. rollup A PR which is a rollup labels Apr 8, 2025
@rustbot
Copy link
Collaborator

rustbot commented Apr 8, 2025

⚠️ Warning ⚠️

  • These commits modify submodules.

@Zalathar
Copy link
Contributor Author

Zalathar commented Apr 8, 2025

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented Apr 8, 2025

📌 Commit 7d32832 has been approved by Zalathar

It is now in the queue for this repository.

@bors 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 Apr 8, 2025
@compiler-errors
Copy link
Member

@matthiaskrgr: Why did you close a larger rollup seemingly in favor of a rollup of less than half its size?

@matthiaskrgr
Copy link
Member

matthiaskrgr commented Apr 8, 2025

Yes, i saved us from sinking a day or two of ci time into a rollup that is almost guaranteed to fail :)

@compiler-errors
Copy link
Member

@matthias: That's not how rollups work. The purpose of a rollup is to test artifacts in parallel. Don't randomly close people's PRs to try to preempt your smaller rollups just because you think it should get merged first.

@compiler-errors
Copy link
Member

@bors r+ rollup=never p=10

@bors
Copy link
Collaborator

bors commented Apr 8, 2025

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented Apr 8, 2025

📌 Commit 7d32832 has been approved by compiler-errors

It is now in the queue for this repository.

@matthiaskrgr
Copy link
Member

If you want to test prs, you should use try-jobs , the way you don't block the queue for a day and and a half

@compiler-errors
Copy link
Member

compiler-errors commented Apr 8, 2025

Making myself clear, it doesn't matter if this rollup fails to get merged.

The purpose of a rollup is to make sure that we're always testing artifacts to push things out of the queue.

If you do the math, we'd have to fail basically every rollup for us to really need to incentivize making small rollups, and there are 33 PRs in the queue, so it doesn't really warrant doing that right now.

@compiler-errors
Copy link
Member

the way you don't block the queue for a day and and a half

Where are you getting this number from? Testing a rollup takes like three hours.

@matthiaskrgr
Copy link
Member

matthiaskrgr commented Apr 8, 2025

unfortunately, if you rollup 20 prs, and there are 3 bad ones which is quite likely, that will mean you won't push anything out of the queue for around 7 hours, and then you will have 45 waiting in the queue:(

@compiler-errors
Copy link
Member

I think things are fine here :) And if this rollup fails, it'll just fall back to the next rollup, so no harm done.

I think it's best not to micromanage other people's rollups without even leaving a comment.

@bors
Copy link
Collaborator

bors commented Apr 8, 2025

⌛ Testing commit 7d32832 with merge 959c2bf...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 8, 2025
…errors

Rollup of 19 pull requests

Successful merges:

 - rust-lang#138676 (Implement overflow for infinite implied lifetime bounds)
 - rust-lang#139024 (Make error message for missing fields with `..` and without `..` more consistent)
 - rust-lang#139098 (Tell LLVM about impossible niche tags)
 - rust-lang#139124 (compiler: report error when trait object type param reference self)
 - rust-lang#139321 (Update to new rinja version (askama))
 - rust-lang#139346 (Don't construct preds w escaping bound vars in `diagnostic_hir_wf_check`)
 - rust-lang#139386 (make it possible to use stage0 libtest on compiletest)
 - rust-lang#139421 (Fix trait upcasting to dyn type with no principal when there are projections)
 - rust-lang#139468 (Don't call `Span::with_parent` on the good path in `has_stashed_diagnostic`)
 - rust-lang#139476 (rm `RegionInferenceContext::var_infos`)
 - rust-lang#139481 (Add job summary links to post-merge report)
 - rust-lang#139485 (compiletest: Stricter parsing for diagnostic kinds)
 - rust-lang#139490 (Update some comment/docs related to "extern intrinsic" removal)
 - rust-lang#139491 (Update books)
 - rust-lang#139496 (Revert r-a changes of rust-lang#139455)
 - rust-lang#139500 (document panic behavior of Vec::resize and Vec::resize_with)
 - rust-lang#139501 (Fix stack overflow in exhaustiveness due to recursive HIR opaque hidden types)
 - rust-lang#139504 (add missing word in doc comment)
 - rust-lang#139507 (compiletest: Trim whitespace from environment variable names)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
---- [ui] tests/ui/compiletest-self-test/env-trim-name.rs stdout ----

error: test run failed!
status: exit status: 134
command: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/compiletest-self-test/env-trim-name" && MY_EXEC_ENV=" my-exec-value" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUST_TEST_THREADS="4" "/wasmtime-v19.0.0-x86_64-linux/wasmtime" "run" "-C" "cache=n" "--dir" "." "--env" "RUSTC_BOOTSTRAP" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/compiletest-self-test/env-trim-name/a.wasm"
stdout: none
--- stderr -------------------------------

thread 'main' panicked at /checkout/tests/ui/compiletest-self-test/env-trim-name.rs:14:5:
assertion `left == right` failed
  left: Err(NotPresent)
 right: Ok(" my-exec-value")
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
Error: failed to run main module `/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/compiletest-self-test/env-trim-name/a.wasm`

Caused by:
    0: failed to invoke command default
    1: error while executing at wasm backtrace:
           0: 0x4051 - a.wasm!__rustc[2e92fd3a05a752b4]::__rust_start_panic
           1: 0x3ec2 - a.wasm!__rustc[2e92fd3a05a752b4]::rust_panic
           2: 0x3e95 - a.wasm!std::panicking::rust_panic_with_hook::h5a70ecac66721dfe
           3: 0x2f37 - a.wasm!std::panicking::begin_panic_handler::{{closure}}::h0c38b59cdb955a2a
           4: 0x2ea3 - a.wasm!std::sys::backtrace::__rust_end_short_backtrace::h86bf1a335ca6ce13
           5: 0x3828 - a.wasm!__rustc[2e92fd3a05a752b4]::rust_begin_unwind
           6: 0x8253 - a.wasm!core::panicking::panic_fmt::hc0919c759f330d26
           7: 0x9e79 - a.wasm!core::panicking::assert_failed_inner::h91d603150ebd817c
           8:  0x451 - a.wasm!core::panicking::assert_failed::h851ba26672a84008
           9:  0x52d - a.wasm!env_trim_name::main::h7ec0c8a2ec8aae40
          10:  0x2c7 - a.wasm!std::sys::backtrace::__rust_begin_short_backtrace::he938f4cb913e7d40
          11:  0x2ba - a.wasm!std::rt::lang_start::{{closure}}::h47e476c689a93465
          12: 0x193d - a.wasm!std::rt::lang_start_internal::h3ccbd4867c11502a
          13:  0x566 - a.wasm!__main_void
          14:  0x293 - a.wasm!_start
    2: wasm trap: wasm `unreachable` instruction executed
------------------------------------------



failures:

@bors
Copy link
Collaborator

bors commented Apr 8, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 8, 2025
@Zalathar Zalathar closed this Apr 8, 2025
@Zalathar Zalathar deleted the rollup-ldbvvyf branch April 8, 2025 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.