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.

Sign up for GitHub

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

Jump to bottom

Rollup of 4 pull requests #125860

Closed
wants to merge 9 commits into from
Closed

Rollup of 4 pull requests #125860

wants to merge 9 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tspiteri and others added 9 commits April 23, 2024 15:49
@tspiteri
unroll first iter of checked_ilog loop to save one multiplication
3b2436c
@tspiteri
add codegen test
245cc23 
The test confirms that when val < base, we do not divide or multiply.
cargo update
0999039 
     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
@Urgau
Refactor --print=check-cfg test
a7e7848
@onur-ozkan
include missing submodule on bootstrap
5cdec65 
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>
@matthiaskrgr
Rollup merge of rust-lang#124294 - tspiteri:ilog-first-iter, r=the8472
83a4314 
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.
@matthiaskrgr
Rollup merge of rust-lang#125562 - rust-lang:cargo_update, r=Mark-Sim…
0afcbf3 
…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
```
@matthiaskrgr
Rollup merge of rust-lang#125822 - Urgau:print-check-cfg-refactor-tes…
5b6d381 
…t, r=jieyouxu

Refactor `--print=check-cfg` test

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

r? ``````@jieyouxu``````
@matthiaskrgr
Rollup merge of rust-lang#125856 - onur-ozkan:bootstrap-submodule-hot…
77ca71f 
…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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 1, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Jun 1, 2024

📌 Commit 77ca71f 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
@bors
Copy link
Contributor

bors commented Jun 1, 2024

⌛ Testing commit 77ca71f with merge 7b7afc2...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2024
@bors
Auto merge of rust-lang#125860 - matthiaskrgr:rollup-uu9g4vz, r=matth…
7b7afc2 
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#124294 (Unroll first iteration of checked_ilog loop)
 - rust-lang#125562 (Weekly `cargo update`)
 - rust-lang#125822 (Refactor `--print=check-cfg` test)
 - rust-lang#125856 (include missing submodule on bootstrap)

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

The job x86_64-gnu-distcheck failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
[TIMING] core::build_steps::tool::Tidy { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu }, target: x86_64-unknown-linux-gnu } -- 0.022
fmt check
fmt: checked 4526 files
tidy check
thread 'deps (.)' panicked at src/tools/tidy/src/deps.rs:522:24:
cmd.exec() failed with `cargo metadata` exited with an error: error: failed to select a version for the requirement `r-efi = "^4.1.0"` (locked to 4.4.0)
candidate versions found which didn't match: 4.5.0
location searched: directory source `/checkout/obj/build/tmp/distcheck/vendor` (which is replacing registry `crates-io`)
required by package `uefi_qemu_test v0.0.0 (/checkout/src/ci/docker/host-x86_64/test-various/uefi_qemu_test)`
perhaps a crate was updated and forgotten to be re-vendored?
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
thread 'main' panicked at src/tools/tidy/src/main.rs:61:49:
called `Result::unwrap()` on an `Err` value: Any { .. }
Build completed unsuccessfully in 0:01:00
Build completed unsuccessfully in 0:01:00
make: *** [Makefile:49: check] Error 1
  local time: Sat Jun  1 16:46:53 UTC 2024
  network time: Sat, 01 Jun 2024 16:46:53 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Contributor

bors commented Jun 1, 2024

💔 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 Jun 1, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 1, 2024
Closed
@matthiaskrgr matthiaskrgr deleted the rollup-uu9g4vz branch September 1, 2024 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@matthiaskrgr @bors @rust-log-analyzer @rustbot @tspiteri @Urgau @onur-ozkan