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 7 pull requests #109651

Closed
wants to merge 19 commits into from
Closed

Rollup of 7 pull requests #109651

wants to merge 19 commits into from

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

mattfbacon and others added 19 commits June 28, 2022 17:01
@mattfbacon
Follow C-RW-VALUE in std::io::Cursor example
39eb148
@JohnTitor
Stabilize nonnull_slice_from_raw_parts
22a456a
@benediktwerner
rustdoc: Fix LinkReplacer link matching
73e1459
@benediktwerner
Fix rustdoc/intra-doc/prim-precedence test
ec16250
@benediktwerner
rustdoc: Add test for correct LinkReplacer link matching
f5494e1
@benediktwerner
Fix and format test
bf77fed
@benediktwerner
Fix test for real
8fed6df
@cjgillot
Use an IndexVec to debug fingerprints.
5e49f09
fix type suggestions in match arms
08f3deb
@GuillaumeGomez
Fix "Directly go to item in search if there is only one result" setting
28982a1
@GuillaumeGomez
Add GUI test for "Directly go to item in search if there is only one …
bc9eec0 
…result" setting
@compiler-errors
Don't elaborate non-obligations into obligations
1ce4b37
@Dylan-DPC
Rollup merge of rust-lang#97506 - JohnTitor:stabilize-nonnull-slice-f…
f13a541 
…rom-raw-parts, r=m-ou-se,the8472

Stabilize `nonnull_slice_from_raw_parts`

FCP is done: rust-lang#71941 (comment)
Note that this doesn't const-stabilize `NonNull::slice_from_raw_parts` as `slice_from_raw_parts_mut` isn't const-stabilized yet. Given rust-lang#67456 and rust-lang#57349, it's not likely available soon, meanwhile, stabilizing only the feature makes some sense, I think.

Closes rust-lang#71941
@Dylan-DPC
Rollup merge of rust-lang#98651 - mattfbacon:master, r=ChrisDenton
d0cf0fd 
Follow C-RW-VALUE in std::io::Cursor example

rustc-dev-guide says to do this:

r? `@steveklabnik`
@Dylan-DPC
Rollup merge of rust-lang#108459 - benediktwerner:rustdoc-fix-link-ma…
185cab3 
…tch, r=GuillaumeGomez

rustdoc: Fix LinkReplacer link matching

It currently just uses the first link with the same href which might not necessarily be the matching one.

This fixes replacements when there are several links to the same item but with different text (e.g. `[X] and [struct@X]`). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the `original_lext[1..len() - 1]` part when the first link only has a single character, which is why the new code uses `.get(..)` instead.
@Dylan-DPC
Rollup merge of rust-lang#109587 - cjgillot:no-hashmap-fingerprint, r…
6371b91 
…=Nilstrieb

Use an IndexVec to debug fingerprints.

Uncontroversial part of rust-lang#109050
@Dylan-DPC
Rollup merge of rust-lang#109613 - lukas-code:match-str-to-char-sugge…
ac61f26 
…stion, r=compiler-errors

fix type suggestions in match arms

fix rust-lang#109586
@Dylan-DPC
Rollup merge of rust-lang#109633 - GuillaumeGomez:fix-go-to-only-sett…
7dfd0c2 
…ing, r=notriddle

Fix "Directly go to item in search if there is only one result" setting

Part of rust-lang#66181.

The setting was actually broken, so I fixed it when I added the GUI test.

r? `@notriddle`
@Dylan-DPC
Rollup merge of rust-lang#109641 - compiler-errors:dont-elaborate-non…
dd1d8d3 
…-obl, r=oli-obk

Don't elaborate non-obligations into obligations

It's suspicious to elaborate a `PolyTraitRef` or `Predicate` into an `Obligation`, since the former does not have a param-env associated with it, but the latter does. This is a footgun that, while not being misused *currently* in the compiler, easily could be misused by someone less familiar with the elaborator's inner workings.

This PR just changes the API -- ideally, the elaborator wouldn't even have to deal with obligations if we're not elaborating obligations, but that would require a bit more abstraction than I could be bothered with today.
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. 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 rollup A PR which is a rollup labels Mar 27, 2023
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Mar 27, 2023

📌 Commit dd1d8d3 has been approved by Dylan-DPC

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 Mar 27, 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) 
   Compiling basic-toml v0.1.2
   Compiling askama_derive v0.12.0
    Checking askama v0.12.0
    Checking rustdoc v0.0.0 (/checkout/src/librustdoc)
error[E0277]: can't compare `str` with `std::boxed::Box<str>`
    |
    |
410 |                         self.links.iter().find(|l| l.href == link.href && **text == l.original_text)
    |                                                                                  ^^ no implementation for `str == std::boxed::Box<str>`
    |
    = help: the trait `std::cmp::PartialEq<std::boxed::Box<str>>` is not implemented for `str`
    = help: the following other types implement trait `std::cmp::PartialEq<Rhs>`:
              <&'a str as std::cmp::PartialEq<OsString>>
              <&'a str as std::cmp::PartialEq<rustc_target::json::Json>>
              <&'a str as std::cmp::PartialEq<serde_json::Value>>
              <&'a str as std::cmp::PartialEq<std::string::String>>
              <&'a str as std::cmp::PartialEq<unicase::Ascii<S1>>>
              <&'b str as std::cmp::PartialEq<Cow<'a, str>>>
              <&str as std::cmp::PartialEq<windows::core::strings::bstr::BSTR>>
              <&str as std::cmp::PartialEq<windows::core::strings::hstring::HSTRING>>

For more information about this error, try `rustc --explain E0277`.
error: could not compile `rustdoc` due to previous error
Build completed unsuccessfully in 0:01:25

@Dylan-DPC
Copy link
Member Author

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 27, 2023
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 27, 2023
Merged
@Dylan-DPC Dylan-DPC closed this Mar 27, 2023
@Dylan-DPC Dylan-DPC deleted the rollup-e9uw9rx branch March 27, 2023 09:35
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
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@Dylan-DPC @bors @rust-log-analyzer @rustbot @mattfbacon @JohnTitor @benediktwerner @cjgillot @GuillaumeGomez @compiler-errors