Skip to content

Rollup of 6 pull requests - #124140

Closed
workingjubilee wants to merge 18 commits into
rust-lang:masterfrom
workingjubilee:rollup-wrub705
Closed

Rollup of 6 pull requests#124140
workingjubilee wants to merge 18 commits into
rust-lang:masterfrom
workingjubilee:rollup-wrub705

Conversation

@workingjubilee

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

daxpeddaand others added 18 commits March 10, 2024 09:00
Co-Authored-By: Ralf Jung <330628+RalfJung@users.noreply.github.com>
(this currently produces malformed mir: we call `eq` with first argument not
being a reference)
Do not accept the following
```rust
macro_rules! lexes {($($_:tt)*) => {}}
lexes!(🐛"foo");
```
Before, invalid emoji identifiers were gated during parsing instead of lexing in all cases, but this didn't account for macro expansion of literal prefixes.
Fixrust-lang#123696.
It's required for the next commit.
Note that you can still have `G = &H`, since there are implementations of all
the graph traits for references.
Introduce perma-unstable `wasm-c-abi` flag
Now that `wasm-bindgen` v0.2.88 supports the spec-compliant C ABI, the idea is to switch to that in a future version of Rust. In the meantime it would be good to let people test and play around with it.
This PR introduces a new perma-unstable `-Zwasm-c-abi` compiler flag, which switches to the new spec-compliant C ABI when targeting `wasm32-unknown-unknown`.
Alternatively, we could also stabilize this and then deprecate it when we switch. I will leave this to the Rust maintainers to decide.
This is a companion PR to rust-lang#117918, but they could be merged independently.
MCP: rust-lang/compiler-team#703
Tracking issue: rust-lang#122532
…, r=compiler-errors
Correctly change type when adding adjustments on top of `NeverToAny`
I'm concerned that the check only caught the problem with `fallback = !`, because at least MIR contained `<() as PartialEq>::eq(move _5, move _7)` where `_5: ()`.
I rediscovered the issue when looking at rust-lang#123482's crater run.
r? compiler-errors
Fixesrust-lang#120600
Properly handle emojis as literal prefix in macros
Do not accept the following
```rust
macro_rules! lexes {($($_:tt)*) => {}}
lexes!(🐛"foo");
```
Before, invalid emoji identifiers were gated during parsing instead of lexing in all cases, but this didn't account for macro pre-expansion of literal prefixes.
Fixrust-lang#123696.
…r, r=wesleywiser
Add an opt-in to store incoming edges in `VecGraph` + misc
r? `@fmease`
needed for rust-lang#123939
…errors
Fix negating `f16` and `f128` constants
Make `f16` and `f128` constants respect `neg` in `parse_float_into_scalar`.
Tracking issue: rust-lang#116909
`@rustbot` label +F-f16_and_f128
…lstrieb
when suggesting RUST_BACKTRACE=1, add a special note for Miri's env var isolation
Fixesrust-lang/miri#2855
@rustbotrustbot added 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-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 Apr 18, 2024
@workingjubilee

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=6

@bors

bors commented Apr 18, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 8d5587e has been approved by workingjubilee

It is now in the queue for this repository.

@borsbors 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 Apr 18, 2024
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job x86_64-gnu-llvm-17 failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
#16 exporting to docker image format
#16 sending tarball 29.3s done
#16 DONE 34.4s
##[endgroup]
Setting extra environment values for docker: --env ENABLE_GCC_CODEGEN=1 --env GCC_EXEC_PREFIX=/usr/lib/gcc/
[CI_JOB_NAME=x86_64-gnu-llvm-17]
---
sccache: Starting the server...
##[group]Configure the build
configure: processing command line
configure: configure: build.configure-args := ['--build=x86_64-unknown-linux-gnu', '--llvm-root=/usr/lib/llvm-17', '--enable-llvm-link-shared', '--set', 'rust.thin-lto-import-instr-limit=10', '--set', 'change-id=99999999', '--enable-verbose-configure', '--enable-sccache', '--disable-manage-submodules', '--enable-locked-deps', '--enable-cargo-native-static', '--set', 'rust.codegen-units-std=1', '--set', 'dist.compression-profile=balanced', '--dist-compression-formats=xz', '--disable-dist-src', '--release-channel=nightly', '--enable-debug-assertions', '--enable-overflow-checks', '--enable-llvm-assertions', '--set', 'rust.verify-llvm-ir', '--set', 'rust.codegen-backends=llvm,cranelift,gcc', '--set', 'llvm.static-libstdcpp', '--enable-new-symbol-mangling']
configure: target.x86_64-unknown-linux-gnu.llvm-config := /usr/lib/llvm-17/bin/llvm-config
configure: llvm.link-shared := True
configure: rust.thin-lto-import-instr-limit := 10
configure: change-id := 99999999
---
##[group]Testing stage2 compiletest suite=crashes mode=crashes (x86_64-unknown-linux-gnu)
running 185 tests
........................................................................................ 88/185
...2024-04-18T23:25:43.118155Z ERROR compiletest::runtest: fatal error, panic: "test no longer crashes/triggers ICE! Please give it a mearningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit."
[crashes] tests/crashes/120600-2.rs ... F
[crashes] tests/crashes/120600-2.rs ... F
....2024-04-18T23:25:43.137968Z ERROR compiletest::runtest: fatal error, panic: "test no longer crashes/triggers ICE! Please give it a mearningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit."
[crashes] tests/crashes/120600.rs ... F
............................................................................... 176/185
.........
failures:
---- [crashes] tests/crashes/120600-2.rs stdout ----
error: test no longer crashes/triggers ICE! Please give it a mearningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit.
thread '[crashes] tests/crashes/120600-2.rs' panicked at src/tools/compiletest/src/runtest.rs:2803:9:
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
---- [crashes] tests/crashes/120600.rs stdout ----
error: test no longer crashes/triggers ICE! Please give it a mearningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit.
thread '[crashes] tests/crashes/120600.rs' panicked at src/tools/compiletest/src/runtest.rs:2803:9:
failures:
[crashes] tests/crashes/120600-2.rs

@bors

bors commented Apr 18, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8d5587e with merge 5b2e2f5...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2024
…kingjubilee
Rollup of 6 pull requests
Successful merges:
- rust-lang#117919 (Introduce perma-unstable `wasm-c-abi` flag)
- rust-lang#123571 (Correctly change type when adding adjustments on top of `NeverToAny`)
- rust-lang#123752 (Properly handle emojis as literal prefix in macros)
- rust-lang#123980 ( Add an opt-in to store incoming edges in `VecGraph` + misc)
- rust-lang#124110 (Fix negating `f16` and `f128` constants)
- rust-lang#124116 (when suggesting RUST_BACKTRACE=1, add a special note for Miri's env var isolation)
r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job x86_64-gnu-llvm-18 failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
test [crashes] tests/crashes/120503.rs ... ok
test [crashes] tests/crashes/120792.rs ... ok
test [crashes] tests/crashes/120793-2.rs ... ok
test [crashes] tests/crashes/120793.rs ... ok
2024-04-18T23:44:13.162956Z ERROR compiletest::runtest: fatal error, panic: "test no longer crashes/triggers ICE! Please give it a mearningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit."
test [crashes] tests/crashes/120911.rs ... ok
test [crashes] tests/crashes/120811.rs ... ok
test [crashes] tests/crashes/120873.rs ... ok
test [crashes] tests/crashes/120873.rs ... ok
2024-04-18T23:44:13.188621Z ERROR compiletest::runtest: fatal error, panic: "test no longer crashes/triggers ICE! Please give it a mearningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit."
test [crashes] tests/crashes/121052.rs ... ok
test [crashes] tests/crashes/121097.rs ... ok
test [crashes] tests/crashes/121126.rs ... ok
test [crashes] tests/crashes/121063.rs ... ok
---
failures:
---- [crashes] tests/crashes/120600-2.rs stdout ----
error: test no longer crashes/triggers ICE! Please give it a mearningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit.
thread '[crashes] tests/crashes/120600-2.rs' panicked at src/tools/compiletest/src/runtest.rs:2803:9:
stack backtrace:
0: rust_begin_unwind
1: core::panicking::panic_fmt
2: <compiletest::runtest::TestCx>::fatal
2: <compiletest::runtest::TestCx>::fatal
3: <compiletest::runtest::TestCx>::run_revision
4: compiletest::runtest::run
5: <compiletest::make_test_closure::{closure#0} as core::ops::function::FnOnce<()>>::call_once::{shim:vtable#0}
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
---- [crashes] tests/crashes/120600.rs stdout ----
error: test no longer crashes/triggers ICE! Please give it a mearningful name, add a doc-comment to the start of the test explaining why it exists and move it to tests/ui or wherever you see fit.
thread '[crashes] tests/crashes/120600.rs' panicked at src/tools/compiletest/src/runtest.rs:2803:9:
stack backtrace:
0: rust_begin_unwind
1: core::panicking::panic_fmt
2: <compiletest::runtest::TestCx>::fatal

@bors

bors commented Apr 18, 2024

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Apr 18, 2024
@workingjubilee

Copy link
Copy Markdown
MemberAuthor

Fascinating!

@workingjubilee

Copy link
Copy Markdown
MemberAuthor

@bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 18, 2024
@workingjubilee
workingjubilee deleted the rollup-wrub705 branch April 18, 2024 23:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant 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.

9 participants

@workingjubilee@bors@rust-log-analyzer@rustbot@daxpedda@WaffleLapkin@estebank@beetrees@RalfJung