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 9 pull requests #107787

Closed
wants to merge 18 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Jon Gjengset and others added 18 commits February 3, 2023 17:59
Makes generation of `manifest.in` deterministic:
rust-lang/rust-installer#120
Since these elements now use `white-space: pre-wrap` since
784665d, it's fine to use newlines
for formatting, which is smaller and a bit less complicated.
Modify main message to be more conversational and emit one fewer note.
…-Simulacrum

Bump rust-installer

Makes generation of `manifest.in` deterministic:
rust-lang/rust-installer#120
…yn514

Allow automatically creating vscode `settings.json` with `x setup`

Closes rust-lang#107703
Change `arena_cache` to not alter the declared query result

This makes the return types a bit clearer, limiting `arena_cache`'s effect to just the computation side. It also makes it easier to potentially remove `arena_cache`.

r? `@cjgillot`
Rename `PointerSized` to `PointerLike`

The old name was unnecessarily vague. This PR renames a nightly language feature that I added, so I don't think it needs any additional approval, though anyone can feel free to speak up if you dislike the rename.

It's still unsatisfying that we don't the user which of {size, alignment} is wrong, but this trait really is just a stepping stone for a more generalized mechanism to create `dyn*`, just meant for nightly testing, so I don't think it really deserves additional diagnostic machinery for now.

Fixes rust-lang#107696, cc `@RalfJung`
r? `@eholk`
…aumeGomez

rustdoc: use a newline instead of `<br>` to format code headers

Since these elements now use `white-space: pre-wrap` since rust-lang#107615, it's fine to use newlines for formatting, which is smaller and a bit less complicated.
Tweak ICE message

Modify main message to be more conversational and emit one fewer note.
…te, r=estebank

Clearly signal purpose of the yaml template

Following up on rust-lang#106898 (comment)
…, r=cuviper

Docs: Fix format of headings in String::reserve

It was inconsistent with other doc comments in the same module (and the rest of the rust std docs).
…ckh726

Remove astconv usage in diagnostic

Fixes rust-lang#107775

Location of the test sucks, I know, but I needed to put it somewhere 😓
The issue here is that the root cause of the issue has nothing to do with what's being tested, so I couldn't really give it a better name. Oh well.
@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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Feb 8, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Feb 8, 2023

📌 Commit 63ec775 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 8, 2023
@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)
    Checking rustc_resolve v0.0.0 (/checkout/compiler/rustc_resolve)
error[E0308]: mismatched types
   --> compiler/rustc_codegen_ssa/src/back/symbol_export.rs:442:48
    |
442 |     providers.upstream_monomorphizations_for = upstream_monomorphizations_for_provider;
    |
    |
    = note: expected fn pointer `for<'tcx> fn(TyCtxt<'tcx>, DefId) -> &'tcx Option<&'tcx HashMap<&'tcx rustc_middle::ty::List<rustc_middle::ty::GenericArg<'tcx>>, CrateNum, BuildHasherDefault<FxHasher>>>`
                  found fn item `for<'a> fn(TyCtxt<'a>, DefId) -> Option<&'a HashMap<..., ..., ...>> {upstream_monomorphizations_for_provider}`
For more information about this error, try `rustc --explain E0308`.
error: could not compile `rustc_codegen_ssa` due to previous error
warning: build failed, waiting for other jobs to finish...
error: could not compile `rustc_codegen_ssa` due to previous error

@matthiaskrgr matthiaskrgr deleted the rollup-k0g6512 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
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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.