Skip to content

Rollup of 2 pull requests #113532

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
Merged
merged 6 commits into from
Jul 10, 2023
Merged

Rollup of 2 pull requests #113532

merged 6 commits into from
Jul 10, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

chenyukang and others added 6 commits July 7, 2023 09:00
@chenyukang
Add filter with next segment while lookup typo for path
6f53e61
@chenyukang
smart_resolve_partial_mod_path_errors should not suggest parent
9763472
@chenyukang
adjust smart_resolve_partial_mod_path_errors
37b40e5
@bjorn3
Remove the library/term exception in tidy's pal checker code
470c244 
This crate doesn't exist anymore.
@matthiaskrgr
Rollup merge of rust-lang#113331 - chenyukang:yukang-fix-112590-false…
70c6378 
…-positive, r=estebank

Add filter with following segment while lookup typo for path

From the discussion: rust-lang#112917 (comment)

Seems we can not get the assoc items for `Struct`, `Enum` in the resolving phase.
A obvious filter is avoid suggesting the same name with the following segment path.

Use `following_seg` can extend the function `smart_resolve_partial_mod_path_errors` for more scenarios, such as `std::sync_error::atomic::AtomicBool` in test case.

r? `@estebank`
@matthiaskrgr
Rollup merge of rust-lang#113524 - bjorn3:remove_tidy_pal_exception, …
34aebbd 
…r=the8472

Remove the library/term exception in tidy's pal checker code

This crate doesn't exist anymore.
@rustbot rustbot added 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. rollup A PR which is a rollup labels Jul 10, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=2

@bors
Copy link
Collaborator

bors commented Jul 10, 2023

📌 Commit 34aebbd 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 Jul 10, 2023
@bors
Copy link
Collaborator

bors commented Jul 10, 2023

⌛ Testing commit 34aebbd with merge 55e8df2...

@bors
Copy link
Collaborator

bors commented Jul 10, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 55e8df2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 10, 2023
@bors bors merged commit 55e8df2 into rust-lang:master Jul 10, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 10, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#113331 Add filter with following segment while lookup typo for path 2d11f49cae44bb82d2db02e399d9b454ef66ef51 (link)
#113524 Remove the library/term exception in tidy's pal checker code b3d833e0dae943ba04bed07519679ebae5eb733c (link)

previous master: a482149598

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 (55e8df2): comparison URL.

Overall result: ❌ regressions - 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)		 4.4% [4.4%, 4.4%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

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.0% [-3.0%, -3.0%] 1
Improvements ✅
(secondary)		 -1.7% [-1.7%, -1.7%] 1
All ❌✅ (primary) -3.0% [-3.0%, -3.0%] 1

Cycles

Results

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)		 1.3% [1.3%, 1.3%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 1.3% [1.3%, 1.3%] 1

Binary size

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

Bootstrap: 658.809s -> 656.907s (-0.29%)

@matthiaskrgr matthiaskrgr deleted the rollup-mty7u37 branch March 16, 2024 18:19
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-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.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.
6 participants
@matthiaskrgr @bors @rust-timer @rustbot @chenyukang @bjorn3