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 5 pull requests #125858

Closed
wants to merge 12 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tspiteri and others added 12 commits April 23, 2024 15:49
The test confirms that when val < base, we do not divide or multiply.
     Locking 15 packages to latest compatible versions
    Updating cc v1.0.97 -> v1.0.98
    Updating crc32fast v1.4.0 -> v1.4.2
    Updating crossbeam-channel v0.5.12 -> v0.5.13
    Updating crossbeam-utils v0.8.19 -> v0.8.20
    Updating getrandom v0.2.14 -> v0.2.15
    Updating libz-sys v1.1.16 -> v1.1.18
    Updating nu-ansi-term v0.49.0 -> v0.50.0
    Updating parking_lot v0.12.2 -> v0.12.3
    Updating proc-macro2 v1.0.82 -> v1.0.84
    Updating r-efi v4.4.0 -> v4.5.0
    Updating serde v1.0.202 -> v1.0.203
    Updating serde_derive v1.0.202 -> v1.0.203
    Updating spanned v0.2.0 -> v0.2.1
    Updating syn v2.0.64 -> v2.0.66
    Updating tracing-tree v0.3.0 -> v0.3.1
note: pass `--verbose` to see 80 unchanged dependencies behind latest
As of rust-lang#125408 PR,
rustbook now relies on dependencies from the "src/doc/book" submodule.

However, bootstrap does not automatically sync this submodule before reading
metadata informations. And if the submodule is not present, reading
metadata will fail because rustbook's dependencies will be missing.

This change makes "src/doc/book" to be fetched/synced automatically
before trying to read metadata.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
Unroll first iteration of checked_ilog loop

This follows the optimization of rust-lang#115913. As shown in rust-lang#115913 (comment), the performance was improved in all important cases, but some regressions were introduced for the benchmarks `u32_log_random_small`, `u8_log_random` and `u8_log_random_small`.

Basically, rust-lang#115913 changed the implementation from one division per iteration to one multiplication per iteration plus one division. When there are zero iterations, this is a regression from zero divisions to one division.

This PR avoids this by avoiding the division if we need zero iterations by returning `Some(0)` early. It also reduces the number of multiplications by one in all other cases.
…ulacrum

Weekly `cargo update`

Automation to keep dependencies in `Cargo.lock` current.

The following is the output from `cargo update`:

```txt
     Locking 15 packages to latest compatible versions
    Updating cc v1.0.97 -> v1.0.98
    Updating crc32fast v1.4.0 -> v1.4.2
    Updating crossbeam-channel v0.5.12 -> v0.5.13
    Updating crossbeam-utils v0.8.19 -> v0.8.20
    Updating getrandom v0.2.14 -> v0.2.15
    Updating libz-sys v1.1.16 -> v1.1.18
    Updating nu-ansi-term v0.49.0 -> v0.50.0
    Updating parking_lot v0.12.2 -> v0.12.3
    Updating proc-macro2 v1.0.82 -> v1.0.84
    Updating r-efi v4.4.0 -> v4.5.0
    Updating serde v1.0.202 -> v1.0.203
    Updating serde_derive v1.0.202 -> v1.0.203
    Updating spanned v0.2.0 -> v0.2.1
    Updating syn v2.0.64 -> v2.0.66
    Updating tracing-tree v0.3.0 -> v0.3.1
note: pass `--verbose` to see 80 unchanged dependencies behind latest
```
…s, r=lcnr

Uplift `{Closure,Coroutine,CoroutineClosure}Args` and friends to `rustc_type_ir`

Part of converting the new solver's `structural_traits.rs` to be interner-agnostic.

I decided against aliasing `ClosureArgs<TyCtxt<'tcx>>` to `ClosureArgs<'tcx>` because it seemed so rare. I could do so if desired, though.

r? lcnr
…t, r=jieyouxu

Refactor `--print=check-cfg` test

*as asked in rust-lang#125818 (comment)

r? `````@jieyouxu`````
…fix, r=onur-ozkan

include missing submodule on bootstrap

As of rust-lang#125408 PR, rustbook now relies on dependencies from the "src/doc/book" submodule.

However, bootstrap does not automatically sync this submodule before reading metadata informations. And if the submodule is not present, reading metadata will fail because rustbook's dependencies will be missing.

This change makes "src/doc/book" to be fetched/synced automatically before trying to read metadata.

cc ``@Zalathar``
@rustbot rustbot added 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-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative rollup A PR which is a rollup labels Jun 1, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jun 1, 2024

📌 Commit fc24b19 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 Jun 1, 2024
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
 Documenting rustc_target v0.0.0 (/checkout/compiler/rustc_target)
error: unresolved link to `ClosureArgs`
   --> compiler/rustc_middle/src/ty/sty.rs:205:31
    |
205 | /// is the same reason that [`ClosureArgs`] have `CS` and `U` as type parameters:
    |                               ^^^^^^^^^^^ no item named `ClosureArgs` in scope
    = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
    = note: `-D rustdoc::broken-intra-doc-links` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(rustdoc::broken_intra_doc_links)]`


error: unresolved link to `ClosureArgs::kind`
    --> compiler/rustc_middle/src/ty/sty.rs:1543:56
     |
1543 |     /// After upvar analysis, you should instead use [`ClosureArgs::kind()`]
     |                                                        ^^^^^^^^^^^^^^^^^^^ no item named `ClosureArgs` in scope
error: unresolved link to `CoroutineClosureArgs::kind`
    --> compiler/rustc_middle/src/ty/sty.rs:1544:14
     |
     |
1544 |     /// or [`CoroutineClosureArgs::kind()`] to assert that the `ClosureKind`
     |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no item named `CoroutineClosureArgs` in scope
 Documenting rustc_next_trait_solver v0.0.0 (/checkout/compiler/rustc_next_trait_solver)
error: could not document `rustc_middle`
warning: build failed, waiting for other jobs to finish...
Build completed unsuccessfully in 0:00:38

@matthiaskrgr matthiaskrgr deleted the rollup-1paeq3d branch September 1, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants