Skip to content
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

Rollup of 6 pull requests #121407

Closed
wants to merge 15 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

devnexen and others added 15 commits January 13, 2024 18:31
allows for socket to process only when there is data to process,
the option sets a number of seconds until the data is ready.
Signed-off-by: David Wood <david@davidtw.co>
…=joshtriplett

os::net: expanding TcpStreamExt for Linux with `tcp_deferaccept`.

allows for socket to process only when there is data to process, the option sets a number of seconds until the data is ready.
coverage: Remove `pending_dups` from the span refiner

When extracting coverage spans from a function's MIR, we need to decide how to handle spans that are associated with more than one node (BCB) in the coverage control flow graph.

The existing code for managing those duplicate spans is very subtle and difficult to modify. But by eagerly deduplicating those extracted spans in a much simpler way, we can remove a massive chunk of complexity from the span refiner.

There is a tradeoff here, in that we no longer try to retain *all* nondominating BCBs that have the same span, only the last one in the (semi-arbitrary) dominance ordering. But in practice, this produces very little difference in our coverage tests, and the simplification is so significant that I think it's worthwhile.

`@rustbot` label +A-code-coverage
… r=wesleywiser

triagebot: add queue notifications

This seems like it could be useful.

r? `@wesleywiser`
…-errors

never patterns: Fix liveness analysis in the presence of never patterns

There's a bunch of code that only looks at the first alternative of an or-pattern, under the assumption that all alternatives have the same set of bindings. This is true except for never pattern alternatives  (e.g. `Ok(x) | Err(!)`), so we skip these. I expect there's other code with this problem, I'll have to check that later.

I don't have tests for this yet because mir lowering causes other issues; I'll have some in the next PR.

r? `@compiler-errors`
…trochenkov

Solaris linker does not support --strip-debug

Fixes rust-lang#121381
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself O-unix Operating system: Unix-like 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 21, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Feb 21, 2024

📌 Commit d3d0ae7 has been approved by matthiaskrgr

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 Feb 21, 2024
@bors
Copy link
Contributor

bors commented Feb 21, 2024

⌛ Testing commit d3d0ae7 with merge a4d2b17...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 21, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#119636 (os::net: expanding TcpStreamExt for Linux with `tcp_deferaccept`.)
 - rust-lang#121261 (coverage: Remove `pending_dups` from the span refiner)
 - rust-lang#121336 (triagebot: add queue notifications)
 - rust-lang#121391 (never patterns: Fix liveness analysis in the presence of never patterns)
 - rust-lang#121399 (Solaris linker does not support --strip-debug)
 - rust-lang#121406 (Add a couple tests)

Failed merges:

 - rust-lang#121206 (Top level error handling)

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

The job dist-android failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling addr2line v0.21.0
[RUSTC-TIMING] addr2line test:false 0.391
[RUSTC-TIMING] gimli test:false 3.604
[RUSTC-TIMING] object test:false 4.446
error[E0599]: no method named `set_deferaccept` found for reference `&Socket` in the current scope
    |
    |
115 |         self.as_inner().as_inner().set_deferaccept(accept)
    |                                    ^^^^^^^^^^^^^^^ method not found in `&Socket`

error[E0599]: no method named `deferaccept` found for reference `&Socket` in the current scope
    |
    |
119 |         self.as_inner().as_inner().deferaccept()
    |                                    ^^^^^^^^^^^ help: there is a method with a similar name: `accept`
For more information about this error, try `rustc --explain E0599`.
[RUSTC-TIMING] std test:false 2.746
error: could not compile `std` (lib) due to 2 previous errors
Build completed unsuccessfully in 0:15:27

@bors
Copy link
Contributor

bors commented Feb 21, 2024

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 21, 2024
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 21, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-gf2ohp5 branch March 16, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself O-unix Operating system: Unix-like rollup A PR which is a rollup 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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants