Skip to content

Rollup of 7 pull requests #103391

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 15 commits into from
Closed

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkin and others added 15 commits October 2, 2022 22:08
This checks that:

* the handle is a pipe
* the pipe's file name starts with "msys-" or "cygwin-" rather than looking in the full path.
The latest version of `rental` (v0.5.6) contains a fix that allows it to
compile without relying on the pretty-print back-compat hack.

Hopefully, there are no longer any crates relying on the affected
versions of the (much less popular) `procedural-masquerade` crate. This
should allow us to target the pretty-print back-compat hack specifically
to older versions of `rental`, and specifically mention upgrading to
`rental` v0.5.6 in the lint message.
Only apply `ProceduralMasquerade` hack to older versions of `rental`

The latest version of `rental` (v0.5.6) contains a fix that allows it to
compile without relying on the pretty-print back-compat hack.

Hopefully, there are no longer any crates relying on the affected
versions of the (much less popular) `procedural-masquerade` crate. This
should allow us to target the pretty-print back-compat hack specifically
to older versions of `rental`, and specifically mention upgrading to
`rental` v0.5.6 in the lint message.
Slightly tweak comments wrt `lint_overflowing_range_endpoint`

From the review: rust-lang#101986 (comment)

It _seemed_ that the lint was not emitted when the `if` check failed, but _actually_ this happens already in a special case and the lint is emitted outside of this function, if this function doesn't. I've cleared up the code/comments a bit, so it's more obvious :)

r? `@estebank`
Remove misc_cast and validate types when casting

Continuing our work in rust-lang#102675

r? `@oli-obk`
…oss-crate-gat-params, r=GuillaumeGomez

rustdoc: render bounds of cross-crate GAT params

Follow-up to rust-lang#102439.
Render the trait bounds of type parameters of cross-crate (generic) associated types.

```@rustbot``` label T-rustdoc A-cross-crate-reexports
r? ```@GuillaumeGomez```
…htriplett

(rust-lang#102929) Implement `String::leak` (attempt 2)

Implementation of `String::leak` (rust-lang#102929)

ACP: rust-lang/libs-team#109

Supersedes rust-lang#102941 (see previous reviews there)

`@rustbot` label +T-libs-api -T-libs
…homcc

Add a forgotten check for NonNull::new_unchecked's precondition

Looks like I forgot this function a while ago in rust-lang#92686

r? `@thomcc`
Reduce false positives in msys2 detection

Currently msys2 will be detected by getting the file path and looking to see if it contains the substrings "msys-" and "-ptr" (or "cygwin-" and "-pty"). This risks false positives, especially with filesystem files and if `GetFileInformationByHandleEx` returns a [full path](https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/ntifs/nf-ntifs-ntqueryinformationfile#remarks).

This PR adds a check to see if the handle is a pipe before doing the substring search. Additionally, for "msys2-" or "cygwin-" it only checks if the file name starts with the substring rather than looking at the whole path.
@rustbot rustbot added 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. rollup A PR which is a rollup labels Oct 22, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Oct 22, 2022

📌 Commit da0f4eb has been approved by Dylan-DPC

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 22, 2022
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
  IMAGE: x86_64-gnu-tools
##[endgroup]
From https://github.com/rust-lang/rust
 * branch              master     -> FETCH_HEAD
Searching for toolstate changes between eecde5850cade0c058dc12330081329b31a826c7 and ab7c07e351d341b00b5e50c8e15710b91392eda6
Tool subtrees were updated
##[group]Run src/ci/scripts/verify-channel.sh
src/ci/scripts/verify-channel.sh
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
---
   Compiling shell-escape v0.1.5
   Compiling parking_lot v0.11.2
   Compiling measureme v10.1.0
   Compiling libffi v3.0.1
error[E0599]: no method named `misc_cast` found for mutable reference `&mut rustc_const_eval::interpret::InterpCx<'mir, 'tcx, machine::MiriMachine<'mir, 'tcx>>` in the current scope
    |
    |
440 | ...                   this.misc_cast(&op, dest.layout.ty)?,
    |                            ^^^^^^^^^ method not found in `&mut rustc_const_eval::interpret::InterpCx<'mir, 'tcx, machine::MiriMachine<'mir, 'tcx>>`

error[E0599]: no method named `misc_cast` found for mutable reference `&mut rustc_const_eval::interpret::InterpCx<'mir, 'tcx, machine::MiriMachine<'mir, 'tcx>>` in the current scope
    |
    |
443 | ...                   this.misc_cast(&op, dest.layout.ty)?,
    |                            ^^^^^^^^^ method not found in `&mut rustc_const_eval::interpret::InterpCx<'mir, 'tcx, machine::MiriMachine<'mir, 'tcx>>`

error[E0599]: no method named `misc_cast` found for mutable reference `&mut rustc_const_eval::interpret::InterpCx<'mir, 'tcx, machine::MiriMachine<'mir, 'tcx>>` in the current scope
    |
    |
446 | ...                   this.misc_cast(&op, dest.layout.ty)?,
    |                            ^^^^^^^^^ method not found in `&mut rustc_const_eval::interpret::InterpCx<'mir, 'tcx, machine::MiriMachine<'mir, 'tcx>>`
For more information about this error, try `rustc --explain E0599`.
error: could not compile `miri` due to 3 previous errors
error: could not compile `miri` due to 3 previous errors
thread 'main' panicked at 'in-tree tool', test.rs:489:14
Build completed unsuccessfully in 0:00:14

@matthiaskrgr
Copy link
Member

@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 Oct 22, 2022
@Dylan-DPC Dylan-DPC closed this Oct 22, 2022
@Dylan-DPC Dylan-DPC deleted the rollup-dzgq33f branch October 22, 2022 09:43
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.