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.

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

Rollup of 9 pull requests #130237

Merged
merged 26 commits into from
Sep 11, 2024
Merged

Rollup of 9 pull requests #130237

merged 26 commits into from
Sep 11, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

wafarm and others added 26 commits August 28, 2024 12:54
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Compare to `get_git_merge_base`, this doesn't require configuring the upstream remote.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: FedericoBruzzone <federico.bruzzone.i@gmail.com>
Page affected: https://doc.rust-lang.org/std/collections/index.html#performance

Changes:

- bulleted conventions
- expanded definitions on terms used
- more accessible language
- merged Sequence and Map performance cost tables
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Since rust-lang#130025, the compiler don't ignore missing_docs when compiling the tests.
But there is now a false positive warning for every `#[test]`

For example, this code
```rust
//! Crate docs

fn just_a_test() {}
```

Would emit this warning when running `cargo test`

```
warning: missing documentation for a constant
 --> src/lib.rs:5:1
  |
4 | #[test]
  | ------- in this procedural macro expansion
5 | fn just_a_test() {}
  | ^^^^^^^^^^^^^^^^^^^
```
So that it doesn't fail with `forbid(missing_docs)`

Fixes rust-lang#130218
…mpiler-errors

Don't suggest adding return type for closures with default return type

Follow up of rust-lang#129223

r? ``@compiler-errors``
…attern-syntax, r=compiler-errors

Suggest the correct pattern syntax on usage of unit variant pattern for a struct variant

Closes rust-lang#126243

I add a suggestion on usage of unit variant pattern for a struct variant.
Clarify documentation labelling and definitions for std::collections

Page affected: https://doc.rust-lang.org/std/collections/index.html#performance

Changes:
- bulleted conventions
- expanded definitions on terms used
- more accessible language
- more informative headings
…r-errors

Report the `note` when specified in `diagnostic::on_unimplemented`

Before this PR the `note` field was completely ignored for some reason, now it is shown (I think) correctly during the hir typechecking phase.

1. Report the `note` when specified in `diagnostic::on_unimplemented`
2. Added a test for unimplemented trait diagnostic
3. Added a test for custom unimplemented trait diagnostic

Close rust-lang#130084

P.S. This is my first PR to rustc.
…bzol,RalfJung

refactor merge base logic and fix `x fmt`

When remote upstream is not configured, using [get_git_modified_files](https://github.com/rust-lang/rust/blob/38e3a5771cefc9362976a605549f8b04d5707311/src/tools/build_helper/src/git.rs#L114) to find modified files fails because [get_rust_lang_rust_remote](https://github.com/rust-lang/rust/blob/38e3a5771cefc9362976a605549f8b04d5707311/src/tools/build_helper/src/git.rs#L46-L48) can not resolve "rust-lang/rust" from the git output. The changes in this PR makes bootstrap to find the latest bors commit, treating it as the "closest upstream commit" so that the change tracker logic can use it to find the diffs.

In addition, [skips formatting](rust-lang@e392454) if there are no modified files.

Fixes rust-lang#130147
Map `WSAEDQUOT` to `ErrorKind::FilesystemQuotaExceeded`

cc rust-lang#86442

As summarized in rust-lang#130190, there seems to be a consensus that this should be done.
…LENAME, r=ChrisDenton

Map `ERROR_CANT_RESOLVE_FILENAME` to `ErrorKind::FilesystemLoop`

cc rust-lang#86442

As summarized in rust-lang#130188, there seems to be a consensus that this should be done.
Fix false positive with `missing_docs` and `#[test]`

Since rust-lang#130025, the compiler don't ignore missing_docs when compiling the tests. But there is now a false positive warning for every `#[test]`

For example, this code
```rust
//! Crate docs

fn just_a_test() {}
```

Would emit this warning when running `cargo test`

```
warning: missing documentation for a constant
 --> src/lib.rs:5:1
  |
4 | #[test]
  | ------- in this procedural macro expansion
5 | fn just_a_test() {}
  | ^^^^^^^^^^^^^^^^^^^
```
…enyukang

Make SearchPath::new public

I'm writing a tool that uses `rustc_interface`, and would like to construct `SearchPath` with its `new` method.

As all three fields in `SearchPath` are public anyway, the proposed change should not change the privacy or encapsulation of the struct.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc O-windows Operating system: Windows 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) labels Sep 11, 2024
@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. rollup A PR which is a rollup labels Sep 11, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Sep 11, 2024

📌 Commit 678c249 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 Sep 11, 2024
@bors
Copy link
Contributor

bors commented Sep 11, 2024

⌛ Testing commit 678c249 with merge 8d6b88b...

@bors
Copy link
Contributor

bors commented Sep 11, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 8d6b88b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 11, 2024
@bors bors merged commit 8d6b88b into rust-lang:master Sep 11, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 11, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#129260 Don't suggest adding return type for closures with default … 0045a7ab34f3eb11f24878c35bbecc339efa7f41 (link)
#129520 Suggest the correct pattern syntax on usage of unit variant… 1eba13e0d45e461008883adfd9803c2e45900ec8 (link)
#129866 Clarify documentation labelling and definitions for std::co… 5dcd140e8933367374ec9ffa749e19bc9277bdf7 (link)
#130123 Report the note when specified in `diagnostic::on_unimple… 908aa47baca0c1010c80ebc4917260cbd1932a84 (link)
#130161 refactor merge base logic and fix x fmt b24943f112fac903c62ebf93f4e5069ce1754bd1 (link)
#130206 Map WSAEDQUOT to ErrorKind::FilesystemQuotaExceeded 86614921932796332d0f3af766de75f7c54336ef (link)
#130207 Map ERROR_CANT_RESOLVE_FILENAME to `ErrorKind::Filesystem… d9ec85b7e8b247891063644f9068fe0e71ff7927 (link)
#130219 Fix false positive with missing_docs and #[test] 822feeeb7b689b0f082f292404635bae3892373f (link)
#130221 Make SearchPath::new public a706374b6e848163bf6f183a79de35e3171d783c (link)

previous master: 5bce6d48ff

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 (8d6b88b): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary -2.4%, secondary -5.0%)

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

Cycles

Results (primary 5.8%)

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

Binary size

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

Bootstrap: 756.954s -> 756.94s (-0.00%)
Artifact size: 341.36 MiB -> 341.41 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-windows Operating system: Windows 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.