Rollup of 8 pull requests by workingjubilee · Pull Request #129735 · rust-lang/rust

workingjubilee · 2024-08-29T08:49:58Z

Successful merges:

Don't make statement nonterminals match pattern nonterminals #120221 (Don't make statement nonterminals match pattern nonterminals)
rustdoc-json: Add test for Self type #129123 (rustdoc-json: Add test for Self type)
linker: Synchronize native library search in rustc and linker #129366 (linker: Synchronize native library search in rustc and linker)
Don't use TyKind in a lint #129527 (Don't use TyKind in a lint)
Deny wasm_c_abi lint to nudge the last 25% #129534 (Deny wasm_c_abi lint to nudge the last 25%)
Re-enable android tests/benches in alloc/core #129640 (Re-enable android tests/benches in alloc/core)
allow BufReader::peek to be called on unsized types #129675 (allow BufReader::peek to be called on unsized types)
Allow running ./x.py test compiler #129731 (Allow running ./x.py test compiler)

r? @ghost
@rustbot modify labels: rollup

This shouldn't affect projects indirectly depending on wasm-bindgen because cargo passes `--cap-lints=allow` when building dependencies.

Previously `libname.a` naming was supported as a fallback when producing rlibs, but not when producing executables or dynamic libraries

…-patterns, r=nnethercote Don't make statement nonterminals match pattern nonterminals Right now, the heuristic we use to check if a token may begin a pattern nonterminal falls back to `may_be_ident`: https://github.com/rust-lang/rust/blob/ef71f1047e04438181d7cb925a833e2ada6ab390/compiler/rustc_parse/src/parser/nonterminal.rs#L21-L37 This has the unfortunate side effect that a `stmt` nonterminal eagerly matches against a `pat` nonterminal, leading to a parse error: ```rust macro_rules! m { ($pat:pat) => {}; ($stmt:stmt) => {}; } macro_rules! m2 { ($stmt:stmt) => { m! { $stmt } }; } m2! { let x = 1 } ``` This PR fixes it by more accurately reflecting the set of nonterminals that may begin a pattern nonterminal. As a side-effect, I modified `Token::can_begin_pattern` to work correctly and used that in `Parser::nonterminal_may_begin_with`.

…=fmease rustdoc-json: Add test for `Self` type Inspired by rust-lang#128471, the rustdoc-json suite had no tests in place for the `Self` type. This PR adds one. I've also manually checked locally that this test passes on 29e9248, confirming that adding `clean::Type::SelfTy` didn't change the JSON output. (potentially adding a self type to json (insead of (ab)using generic) is tracked in rust-lang#128522) Updates rust-lang#81359 r? ``@fmease``

linker: Synchronize native library search in rustc and linker Also search for static libraries with alternative naming (`libname.a`) on MSVC when producing executables or dynamic libraries, and not just rlibs. This unblocks rust-lang#123436. try-job: x86_64-msvc

Don't use `TyKind` in a lint Allows us to remove an inherent method from `TyKind` from the type ir crate.

…fcw-to-deny, r=daxpedda,alexcrichton Deny `wasm_c_abi` lint to nudge the last 25% This shouldn't affect projects indirectly depending on wasm-bindgen because cargo passes `--cap-lints=allow` when building dependencies. The motivation is that the ecosystem has mostly taken up the versions of wasm-bindgen that are compatible in general, but ~25% or so of recent downloads remain on lower versions. However, this change might still be unnecessarily disruptive. I mostly propose it as a discussion point.

…, r=tgross35 Re-enable android tests/benches in alloc/core This is basically a revert of rust-lang#73729. These tests better work on android now; it's been 4 years and we don't use dlmalloc on that target anymore. And I've validated that they should pass now with a try-build :)

…d, r=workingjubilee allow BufReader::peek to be called on unsized types rust-lang#128405

…ozkan Allow running `./x.py test compiler`

workingjubilee · 2024-08-29T08:51:03Z

@bors r+ rollup=never p=8

bors · 2024-08-29T08:51:06Z

📌 Commit 1327cea has been approved by workingjubilee

It is now in the queue for this repository.

bors · 2024-08-29T12:39:08Z

⌛ Testing commit 1327cea with merge 082915d...

…kingjubilee Rollup of 8 pull requests Successful merges: - rust-lang#120221 (Don't make statement nonterminals match pattern nonterminals) - rust-lang#129123 (rustdoc-json: Add test for `Self` type) - rust-lang#129366 (linker: Synchronize native library search in rustc and linker) - rust-lang#129527 (Don't use `TyKind` in a lint) - rust-lang#129534 (Deny `wasm_c_abi` lint to nudge the last 25%) - rust-lang#129640 (Re-enable android tests/benches in alloc/core) - rust-lang#129675 (allow BufReader::peek to be called on unsized types) - rust-lang#129731 (Allow running `./x.py test compiler`) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-08-29T15:03:02Z

💔 Test failed - checks-actions

rust-log-analyzer · 2024-08-29T15:03:07Z

A job failed! Check out the build log: (web) (plain)

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

tgross35 · 2024-08-29T18:24:24Z

That was weird. It looks like dist-apple-various just didn't get started?

It sounds like there may be some flukes with Apple runners since per Zulip there was another job that ran out of storage. Not sure if this is related.

@bors retry

…kingjubilee Rollup of 8 pull requests Successful merges: - rust-lang#120221 (Don't make statement nonterminals match pattern nonterminals) - rust-lang#129123 (rustdoc-json: Add test for `Self` type) - rust-lang#129366 (linker: Synchronize native library search in rustc and linker) - rust-lang#129527 (Don't use `TyKind` in a lint) - rust-lang#129534 (Deny `wasm_c_abi` lint to nudge the last 25%) - rust-lang#129640 (Re-enable android tests/benches in alloc/core) - rust-lang#129675 (allow BufReader::peek to be called on unsized types) - rust-lang#129731 (Allow running `./x.py test compiler`) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-08-29T19:00:48Z

⌛ Testing commit 1327cea with merge 25be64c...

rust-log-analyzer · 2024-08-29T20:43:15Z

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.362
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: Thu, Aug 29, 2024  8:43:00 PM
  network time: Thu, 29 Aug 2024 20:43:00 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

bors · 2024-08-29T20:43:54Z

💔 Test failed - checks-actions

tgross35 · 2024-08-29T20:44:05Z

@bors retry #127883

bors · 2024-08-29T23:12:20Z

⌛ Testing commit 1327cea with merge e91ebe5...

…kingjubilee Rollup of 8 pull requests Successful merges: - rust-lang#120221 (Don't make statement nonterminals match pattern nonterminals) - rust-lang#129123 (rustdoc-json: Add test for `Self` type) - rust-lang#129366 (linker: Synchronize native library search in rustc and linker) - rust-lang#129527 (Don't use `TyKind` in a lint) - rust-lang#129534 (Deny `wasm_c_abi` lint to nudge the last 25%) - rust-lang#129640 (Re-enable android tests/benches in alloc/core) - rust-lang#129675 (allow BufReader::peek to be called on unsized types) - rust-lang#129731 (Allow running `./x.py test compiler`) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-08-30T00:55:07Z

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.420
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: Fri, Aug 30, 2024 12:54:50 AM
  network time: Fri, 30 Aug 2024 00:54:50 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

bors · 2024-08-30T00:55:39Z

💔 Test failed - checks-actions

workingjubilee · 2024-08-30T01:43:43Z

I am choosing to believe this rollup is cursed, rational or no.

aDotInTheVoid and others added 19 commits August 15, 2024 13:07

rustdoc-json: Add test for Self type

6ed283b

Don't use TyKind in lint

42a901a

Deny wasm_c_abi lint to nudge the last 25%

af05882

This shouldn't affect projects indirectly depending on wasm-bindgen because cargo passes `--cap-lints=allow` when building dependencies.

Don't make pattern nonterminals match statement nonterminals

c61f85b

linker: Synchronize native library search in rustc and linker

a1c36c6

linker: Better support alternative static library naming on MSVC

05bd36d

Previously `libname.a` naming was supported as a fallback when producing rlibs, but not when producing executables or dynamic libraries

docs: Update docs for the rustc's -L option

ac8f132

Re-enable android tests/benches in alloc

ee05de8

Enable some ilog2 tests as well

83de14c

allow BufReader::peek to be called on unsized types

ae6f8a7

Allow running ./x.py test compiler

e20a888

Rollup merge of rust-lang#129527 - compiler-errors:lint-nit, r=Nadrieril

eeb16a2

Don't use `TyKind` in a lint Allows us to remove an inherent method from `TyKind` from the type ir crate.

Rollup merge of rust-lang#129675 - lolbinarycat:bufreader_peek_unsize…

ff6e551

…d, r=workingjubilee allow BufReader::peek to be called on unsized types rust-lang#128405

Rollup merge of rust-lang#129731 - ferrocene:x-test-compiler, r=onur-…

1327cea

…ozkan Allow running `./x.py test compiler`

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 29, 2024

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 29, 2024

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 29, 2024

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 29, 2024

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 29, 2024

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 29, 2024

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 30, 2024

workingjubilee closed this Aug 30, 2024

workingjubilee deleted the rollup-mxxk9f4 branch August 30, 2024 01:43

workingjubilee mentioned this pull request Aug 31, 2024

Tracking peak total storage use #129808

Open

jieyouxu added the CI-spurious-fail-msvc CI spurious failure: target env msvc label Oct 15, 2024

Uh oh!

Conversation

workingjubilee commented Aug 29, 2024

Uh oh!

workingjubilee commented Aug 29, 2024

Uh oh!

bors commented Aug 29, 2024

Uh oh!

bors commented Aug 29, 2024

Uh oh!

bors commented Aug 29, 2024

Uh oh!

rust-log-analyzer commented Aug 29, 2024

Uh oh!

tgross35 commented Aug 29, 2024

Uh oh!

bors commented Aug 29, 2024

Uh oh!

rust-log-analyzer commented Aug 29, 2024

Uh oh!

bors commented Aug 29, 2024

Uh oh!

tgross35 commented Aug 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Aug 29, 2024

Uh oh!

rust-log-analyzer commented Aug 30, 2024

Uh oh!

bors commented Aug 30, 2024

Uh oh!

workingjubilee commented Aug 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

tgross35 commented Aug 29, 2024 •

edited

Loading