Skip to content

Rollup of 6 pull requests #129324

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

Jump to bottom
Closed
wants to merge 12 commits into from
Closed

Rollup of 6 pull requests #129324

wants to merge 12 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Xiretza and others added 12 commits August 19, 2024 20:22
@Xiretza
Update annotate-snippets to 0.11
c864238
@compiler-errors
Don't consider RibKind::Module's bindings when checking generics shad…
78d0e08 
…owing
@c8ef
fix: simple typo in compiler directory
2575196
@RalfJung
ctfe: make CompileTimeInterpCx type alias public
38af7b0
@kyoto7250
fix link in mir/mod
df568af 
change url path when rewrite those code
@GuillaumeGomez
Remove unneeded conversion to DefId for ExtraInfo
83fce47
@GuillaumeGomez
Rollup merge of rust-lang#129270 - compiler-errors:inner-generics-sha…
8baaa1e 
…dowing, r=petrochenkov

Don't consider locals to shadow inner items' generics

We don't want to consider the bindings from a `RibKind::Module` itself, because for an inner item that module will contain the local bindings from the function body or wherever else the inner item is being defined.

Fixes rust-lang#129265

r? petrochenkov
@GuillaumeGomez
Rollup merge of rust-lang#129277 - Xiretza:update-annotate-snippets, …
23e7f47 
…r=fee1-dead

Update annotate-snippets to 0.11
@GuillaumeGomez
Rollup merge of rust-lang#129308 - c8ef:typo, r=jieyouxu
7d18d55 
fix: simple typo in compiler directory
@GuillaumeGomez
Rollup merge of rust-lang#129309 - RalfJung:CompileTimeInterpCx, r=co…
5b58ca6 
…mpiler-errors

ctfe: make CompileTimeInterpCx type alias public

`CompileTimeMachine` is already public so there is no good reason to not also make this public.

Also add comment explaining why `CompileTimeMachine` is public.
@GuillaumeGomez
Rollup merge of rust-lang#129314 - kyoto7250:fix_link_in_mir_mod, r=c…
d8d1ad9 
…ompiler-errors

fix a broken link in `mir/mod.rs`

I discovered that the internal link in mir/mod.rs is broken, so I will fix it. The AddCallGuards is now located under rustc_mir_transform.

The PR at that time is as follows.
rust-lang@c5fc260
@GuillaumeGomez
Rollup merge of rust-lang#129318 - GuillaumeGomez:rm-unneeded-defid-c…
26cef0c 
…onversion, r=notriddle

Remove unneeded conversion to `DefId` for `ExtraInfo`

I'm working on adding support for "unit test doctests" and this first cleanup came up so just sending it ahead of the rest.

r? `@notriddle`
@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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 20, 2024
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Aug 20, 2024

📌 Commit 26cef0c has been approved by GuillaumeGomez

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 Aug 20, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 20, 2024
@bors
Auto merge of rust-lang#129324 - GuillaumeGomez:rollup-fhf5ors, r=Gui…
9a7f41d 
…llaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#129270 (Don't consider locals to shadow inner items' generics)
 - rust-lang#129277 (Update annotate-snippets to 0.11)
 - rust-lang#129308 (fix: simple typo in compiler directory)
 - rust-lang#129309 (ctfe: make CompileTimeInterpCx type alias public)
 - rust-lang#129314 (fix a broken link in `mir/mod.rs`)
 - rust-lang#129318 (Remove unneeded conversion to `DefId` for `ExtraInfo`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Aug 20, 2024

⌛ Testing commit 26cef0c with merge 9a7f41d...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot) 
[RUSTC-TIMING] miri test:false 4.560
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Tue, Aug 20, 2024  8:07:33 PM
  network time: Tue, 20 Aug 2024 20:07:34 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Collaborator

bors commented Aug 20, 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 Aug 20, 2024
@notriddle
Copy link
Contributor

@bors retry

#127883

@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 Aug 20, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 21, 2024
@bors
Auto merge of rust-lang#129324 - GuillaumeGomez:rollup-fhf5ors, r=Gui…
79c26da 
…llaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#129270 (Don't consider locals to shadow inner items' generics)
 - rust-lang#129277 (Update annotate-snippets to 0.11)
 - rust-lang#129308 (fix: simple typo in compiler directory)
 - rust-lang#129309 (ctfe: make CompileTimeInterpCx type alias public)
 - rust-lang#129314 (fix a broken link in `mir/mod.rs`)
 - rust-lang#129318 (Remove unneeded conversion to `DefId` for `ExtraInfo`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Aug 21, 2024

⌛ Testing commit 26cef0c with merge 79c26da...

@rust-log-analyzer
Copy link
Collaborator

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

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

@bors
Copy link
Collaborator

bors commented Aug 21, 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 Aug 21, 2024
@GuillaumeGomez GuillaumeGomez deleted the rollup-fhf5ors branch August 21, 2024 10:23
@jieyouxu jieyouxu added the CI-spurious-fail-msvc CI spurious failure: target env msvc label Oct 15, 2024
# for free to join this conversation on GitHub. Already have an account? # 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) CI-spurious-fail-msvc CI spurious failure: target env msvc rollup A PR which is a rollup 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-rustdoc Relevant to the rustdoc 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.