Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Xiretza and others added 18 commits August 19, 2024 20:22
change url path when rewrite those code
…op-order, r=jieyouxu

Lint on tail expr drop order change in Edition 2024

This lint warns users to consider extra discretion on the effect of a transposed drop order arising from Edition 2024, which involves temporaries in tail expression location with significant drop implementation.

cc `@traviscross`

Tracking:

- rust-lang#123739
skip updating when external binding is existed

Fixes rust-lang#128813

For following code:

```rs
extern crate core;

fn f() {
    use ::core;
}

macro_rules! m {
    () => {
        extern crate std as core;
    };
}

m!();

fn main() {}
```

- In the first loop, we define `extern crate core` and `use ::core` will be referred to `core` (yes, it does not consider if there are some macros that are not expanded. Ideally, this should be delayed if there are some unexpanded macros in the root, but I didn't change it like that because it seems like a huge change).
- Then `m` is expanded, which makes `extern_prelude('core')` return `std` rather than `core`, causing the inconsistency.

r? `@petrochenkov`
…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
…r=fee1-dead

Update annotate-snippets to 0.11
fix: simple typo in compiler directory
…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.
…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
…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) A-testsuite Area: The testsuite used to check the correctness of rustc 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. rollup A PR which is a rollup labels Aug 20, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Collaborator

bors commented Aug 20, 2024

📌 Commit f631287 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 Aug 20, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 20, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#128662 (Lint on tail expr drop order change in Edition 2024)
 - rust-lang#128932 (skip updating when external binding is existed)
 - rust-lang#129270 (Don't consider locals to shadow inner items' generics)
 - rust-lang#129277 (Update annotate-snippets to 0.11)
 - rust-lang#129294 (Stabilize `iter::repeat_n`)
 - 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 f631287 with merge 745bb66...

@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.475
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: Wed, Aug 21, 2024 12:39:49 AM
  network time: Wed, 21 Aug 2024 00:39:50 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@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
@matthiaskrgr
Copy link
Member Author

@bors retry

@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 21, 2024
@bors
Copy link
Collaborator

bors commented Aug 21, 2024

⌛ Testing commit f631287 with merge 4d7c095...

@bors
Copy link
Collaborator

bors commented Aug 21, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 4d7c095 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 21, 2024
@bors bors merged commit 4d7c095 into rust-lang:master Aug 21, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 21, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#128662 Lint on tail expr drop order change in Edition 2024 2f04cb3aa6bfb94b39fdfaa760bb1a3b7ab3ce45 (link)
#128932 skip updating when external binding is existed 1f1727f27454b3e9f4aff7a6fb509ad6322f17e7 (link)
#129270 Don't consider locals to shadow inner items' generics 0d01d23d945ef7650d4079a9a7f6c7956ccdacf6 (link)
#129277 Update annotate-snippets to 0.11 685a66285f563891bb3fda151697bb179bedcda3 (link)
#129294 Stabilize iter::repeat_n ecebf7e086e0001697f0ddc0eb501425f02f9050 (link)
#129308 fix: simple typo in compiler directory 9479714af7930132222f8930faf107b01f39f0c9 (link)
#129309 ctfe: make CompileTimeInterpCx type alias public 22861e9982af2af87479fc29d8077fbc3d2934e3 (link)
#129314 fix a broken link in mir/mod.rs d866cb503a642cee601cfac26734b1ecd8c75916 (link)
#129318 Remove unneeded conversion to DefId for ExtraInfo 5dab9a637acfd15e389147c9463eee92f4ddac6b (link)

previous master: 5aea14073e

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4d7c095): 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)
-3.2% [-10.3%, -0.5%] 19
Improvements ✅
(secondary)
-5.0% [-7.4%, -1.4%] 21
All ❌✅ (primary) -3.2% [-10.3%, -0.5%] 19

Max RSS (memory usage)

Results (primary -1.5%, secondary -2.2%)

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)
- - 0
Improvements ✅
(primary)
-1.5% [-2.5%, -0.5%] 2
Improvements ✅
(secondary)
-2.2% [-2.3%, -2.1%] 2
All ❌✅ (primary) -1.5% [-2.5%, -0.5%] 2

Cycles

Results (primary -3.5%, secondary -4.9%)

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)
- - 0
Improvements ✅
(primary)
-3.5% [-8.6%, -1.3%] 14
Improvements ✅
(secondary)
-4.9% [-6.4%, -2.7%] 19
All ❌✅ (primary) -3.5% [-8.6%, -1.3%] 14

Binary size

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

Bootstrap: 748.876s -> 750.316s (0.19%)
Artifact size: 338.91 MiB -> 338.93 MiB (0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-rxv463w branch September 1, 2024 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc 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. 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.