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 #130379

Merged
merged 16 commits into from
Sep 15, 2024
Merged

Rollup of 6 pull requests #130379

merged 16 commits into from
Sep 15, 2024

Conversation

Zalathar
Copy link
Contributor

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lolbinarycat and others added 16 commits September 6, 2024 16:28
previously this would cause an infinite loop due to it being
unable to read `n` bytes.
It's very rare for developers to need to modify LLVM,
so "if-unchanged" isn't a good default since it fetches
the LLVM submodule to track changes.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
…=Amanieu

properly handle EOF in BufReader::peek

previously this would cause an infinite loop due to it being unable to read `n` bytes.
…kSimulacrum,workingjubilee

Add `NonNull` convenience methods to `Box` and `Vec`

Implements the ACP: rust-lang/libs-team#418.

The docs for the added methods are mostly copied from the existing methods that use raw pointers instead of `NonNull`.

I'm new to this "contributing to rustc" thing, so I'm sorry if I did something wrong. In particular, I don't know what the process is for creating a new unstable feature. Please advise me if I should do something. Thank you.
…t-profiles, r=Mark-Simulacrum

set `download-ci-llvm = true` by default on "library" and "tools" profiles

It's very rare for developers to need to modify LLVM, so "if-unchanged" isn't a good default for "tools" and "library" profiles since it fetches the LLVM submodule to track changes.
MaybeUninit::zeroed: mention that padding is not zeroed

That should clarify cases like [this](rust-lang#129778 (comment)).
Make some lint doctests compatible with `--stage=0`

Currently, running `x test compiler --stage=0` (with `rust.parallel-compiler=false` to avoid other problems) results in two failures, because these lint doctests aren't compatible with the current stage0 compiler.

In theory, the more “correct” solution would be to wrap the opening triple-backtick line in  `#[cfg_attr(not(bootstrap), doc = "..."]`. However, that causes a few practical problems:
- `tidy` doesn't understand that syntax, and miscounts the number of backticks in the comment block.
- `lint-docs` doesn't understand that syntax, and thinks it's trying to declare the lint name.
- Working around the above problems would cause more work and more confusion for whoever does the next bootstrap beta bump.

So instead this PR adds some bootstrap gates inside the individual doctests, which end up producing the desired behaviour, and are straightforward to remove.
unstable-book: `trait_upcasting` example should not have `#![allow(incomplete_features)]`

Tracking issue: rust-lang#65991

`trait_upcasting` is not currently an incomplete feature; therefore examples of its use do not require `#![allow(incomplete_features)]`.
@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. rollup A PR which is a rollup labels Sep 15, 2024
@Zalathar
Copy link
Contributor Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Sep 15, 2024

📌 Commit 4b6f838 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 Sep 15, 2024
@bors
Copy link
Contributor

bors commented Sep 15, 2024

⌛ Testing commit 4b6f838 with merge 584cf23...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 15, 2024
Rollup of 6 pull requests

Successful merges:

 - rust-lang#130042 (properly handle EOF in BufReader::peek)
 - rust-lang#130061 (Add `NonNull` convenience methods to `Box` and `Vec`)
 - rust-lang#130202 (set `download-ci-llvm = true` by default on "library" and "tools" profiles)
 - rust-lang#130214 (MaybeUninit::zeroed: mention that padding is not zeroed)
 - rust-lang#130353 (Make some lint doctests compatible with `--stage=0`)
 - rust-lang#130370 (unstable-book: `trait_upcasting` example should not have `#![allow(incomplete_features)]`)

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

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Sep 15, 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 Sep 15, 2024
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 15, 2024
@Zalathar
Copy link
Contributor Author

@bors retry (looks flaky; the build logs just cut out for no reason)

@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 Sep 15, 2024
@bors
Copy link
Contributor

bors commented Sep 15, 2024

⌛ Testing commit 4b6f838 with merge bc486f3...

@bors
Copy link
Contributor

bors commented Sep 15, 2024

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing bc486f3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 15, 2024
@bors bors merged commit bc486f3 into rust-lang:master Sep 15, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 15, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#130042 properly handle EOF in BufReader::peek ef3a69fc733c8b48b6c08bb961537a4082e45e95 (link)
#130061 Add NonNull convenience methods to Box and Vec 927a96df5bb22a5f677c153957961cdb3ddbcbc9 (link)
#130202 set download-ci-llvm = true by default on "library" and "… 64be942f12430a24203192bbc2d19bfdac6a9e69 (link)
#130214 MaybeUninit::zeroed: mention that padding is not zeroed c13d66686e5832ebf09124b065207203048fe68f (link)
#130353 Make some lint doctests compatible with --stage=0 f6565e17ea2ef70f31766881f10e494bbfa34159 (link)
#130370 unstable-book: trait_upcasting example should not have `#… a7571a133305c288c90b432dd170be8bd5db339b (link)

previous master: 4f1be92153

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@Zalathar Zalathar deleted the rollup-wpmcnql branch September 15, 2024 07:53
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (bc486f3): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.3% [-2.3%, -2.3%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -2.8%, secondary 3.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.0% [3.0%, 3.0%] 1
Improvements ✅
(primary)
-2.8% [-2.8%, -2.8%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.8% [-2.8%, -2.8%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 760.09s -> 760.068s (-0.00%)
Artifact size: 340.51 MiB -> 340.57 MiB (0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants