Commit graph

274160 commits

Author SHA1 Message Date
The Miri Cronjob Bot
332fefbd3e Preparing for merge from rustc 2024-12-31 05:05:17 +00:00
Oli Scherer
cabc386bd1
Merge pull request #4115 from RalfJung/epoll
epoll: avoid some clones
2024-12-29 09:04:36 +00:00
Oli Scherer
6365292028
Merge pull request #4116 from RalfJung/merge-conflict
triagebot: enable merge conflict notification
2024-12-29 09:00:19 +00:00
Ralf Jung
bf9a76e360 an EpollEventInterest does not need to ref both its FD and its ready list 2024-12-29 09:39:53 +01:00
Ralf Jung
4a43173b67 triagebot: enable merge conflict notification 2024-12-29 09:36:07 +01:00
Ralf Jung
943894289b epoll: avoid some clones 2024-12-28 23:53:25 +01:00
Ralf Jung
22fd2f39ee
Merge pull request #4114 from RalfJung/fd-ref-refactor
FD handling: avoid unnecessary dynamic downcasts
2024-12-28 19:48:14 +00:00
Ralf Jung
7e64216fd5 epoll: keep strong reference while blocking 2024-12-28 18:29:19 +01:00
Ralf Jung
73c44fc368 FD handling: avoid unnecessary dynamic downcasts 2024-12-28 16:02:50 +01:00
Ralf Jung
3fceb037d5
Merge pull request #4113 from rmehri01/toolchain-parsing
fix toolchain flag parsing
2024-12-28 08:17:04 +00:00
Ryan Mehri
0eb5acea2d fix toolchain flag parsing 2024-12-28 00:01:42 -07:00
Oli Scherer
5ccf10edf1
Merge pull request #4112 from RalfJung/socket-cleanup
Socket read/write cleanup
2024-12-27 13:13:19 +00:00
Ralf Jung
6383513249 also clean up eventfd code in the same vein 2024-12-27 12:32:04 +01:00
Ralf Jung
75209df948 add test for close-while-blocked 2024-12-27 12:18:09 +01:00
Ralf Jung
16cffc7275 bring socket logic back together and fix logic bug 2024-12-27 11:37:11 +01:00
Ralf Jung
3623dfd42b
Merge pull request #4111 from rust-lang/rustup-2024-12-27
Automatic Rustup
2024-12-27 09:09:21 +00:00
Ralf Jung
96cfa5f2fd clippy 2024-12-27 09:44:52 +01:00
The Miri Cronjob Bot
0ca3921747 Merge from rustc 2024-12-27 05:24:16 +00:00
clubby789
e32ec45c02 MatchBranchSimplification: Consider empty-unreachable otherwise branch 2024-12-27 10:57:46 +00:00
clubby789
11f7e302e1 Add diff test for MatchBranchSimplification 2024-12-27 10:46:58 +00:00
The Miri Cronjob Bot
2a53a41d89 Preparing for merge from rustc 2024-12-27 05:16:46 +00:00
bors
19e75f4fb3 Auto merge of #134788 - flip1995:clippy-subtree-update, r=matthiaskrgr
Clippy subtree update

r? `@Manishearth`
2024-12-26 18:19:55 +00:00
bors
4ed8cf4237 Auto merge of #134774 - jyn514:rustc-dev-short-backtraces, r=jieyouxu
fix default-backtrace-ice test

when running `tests/ui/panics/default-backtrace-ice.rs locally it gave this error:
```
failures:

---- [ui] tests/ui/panics/default-backtrace-ice.rs stdout ----
Saved the actual stderr to "/home/jyn/src/rust3/build/x86_64-unknown-linux-gnu/test/ui/panics/default-backtrace-ice/default-backtrace-ice.stderr"
diff of stderr:

7
8	aborting due to `-Z treat-err-as-bug=1`
9	stack backtrace:
-	(end_short_backtrace)
-	(begin_short_backtrace)
-	(end_short_backtrace)
-	(begin_short_backtrace)
+	      [... omitted 22 frames ...]
+
```
(note that you must *not* use --bless; we previously did not have an error annotation to verify it was a full backtrace instead of a short backtrace.)

this is a regression from setting RUST_BACKTRACE=1 by default in https://github.com/rust-lang/rust/pull/134743. we need to turn off the new behavior when running UI tests so that they reflect our dist compiler. normally that's done by checking `sess.unstable_opts.ui_testing`, but this happens extremely early in the compiler before we've expanded arg files. do an extremely simple hack that doesn't work in all cases - we don't need it to work in all cases, only when running UI tests.

cc https://github.com/rust-lang/rust/pull/129658#issuecomment-2561988081

r? `@jieyouxu`
2024-12-26 15:41:37 +00:00
Philipp Krones
8a7d8ece32
Merge commit '609cd310be' into clippy-subtree-update 2024-12-26 15:15:54 +01:00
Philipp Krones
609cd310be
Rustup (#13881)
r? @ghost

changelog: none
2024-12-26 13:52:31 +00:00
Philipp Krones
416f7e84c0
Bump nightly version -> 2024-12-26 2024-12-26 14:47:30 +01:00
Philipp Krones
14af404672
Merge remote-tracking branch 'upstream/master' into rustup 2024-12-26 14:46:57 +01:00
bors
e2848a05a9 Auto merge of #134784 - RalfJung:miri-sync, r=RalfJung
Miri subtree update

r? `@ghost`
2024-12-26 13:02:16 +00:00
Philipp Krones
dff0294ab3
fix examples using Ty.kind() in the book (#13875)
`Ty.kind()` is a method.

changelog: none
2024-12-26 12:31:32 +00:00
bors
78af7da26d Auto merge of #132431 - shahn:from_iterator_more_tuples, r=Amanieu
From iterator for more tuples
2024-12-26 09:11:06 +00:00
Ralf Jung
60e3bf4374
Merge pull request #4109 from RalfJung/flags
Error on some invalid flag combinations
2024-12-26 08:12:36 +00:00
Sebastian Hahn
10b23518c1 Impl FromIterator for tuples with arity 1-12 2024-12-26 08:47:49 +01:00
Sebastian Hahn
87e641a2a5 Fix formatting 2024-12-26 08:47:49 +01:00
jyn
801c1d8b90 fix default-backtrace-ice test
when running `tests/ui/panics/default-backtrace-ice.rs locally it gave this error:
```
failures:

---- [ui] tests/ui/panics/default-backtrace-ice.rs stdout ----
Saved the actual stderr to "/home/jyn/src/rust3/build/x86_64-unknown-linux-gnu/test/ui/panics/default-backtrace-ice/default-backtrace-ice.stderr"
diff of stderr:

7
8	aborting due to `-Z treat-err-as-bug=1`
9	stack backtrace:
-	(end_short_backtrace)
-	(begin_short_backtrace)
-	(end_short_backtrace)
-	(begin_short_backtrace)
+	      [... omitted 22 frames ...]
+
```

this is a regression from setting RUST_BACKTRACE=1 by default. we need to turn off the new behavior when running UI tests so that they reflect our dist compiler. normally that's done by checking `sess.unstable_opts.ui_testing`, but this happens extremely early in the compiler before we've expanded arg files. do an extremely simple hack that doesn't work in all cases - we don't need it to work in all cases, only when running UI tests.
2024-12-25 19:47:28 -05:00
bors
a25032cf44 Auto merge of #134768 - RalfJung:const_alloc_layout, r=jhpratt
stabilize const_alloc_layout

libs-api FCP passed in https://github.com/rust-lang/rust/issues/67521

Fixes #67521
2024-12-26 00:13:13 +00:00
Ralf Jung
88b88f336b stabilize const_alloc_layout 2024-12-25 19:28:52 +01:00
bors
7c002ff9a7 Auto merge of #134703 - poliorcetics:ab/push-ovsylkzsoxku, r=GuillaumeGomez
nits: Cleanup of `librustdoc::clean::Cfg::simplify_with`

r? `@GuillaumeGomez`
2024-12-25 16:56:32 +00:00
bors
97a56fb4a6 Auto merge of #134736 - jyn514:msvc-backtraces, r=jieyouxu
Run `tests/ui/backtrace/std-backtrace.rs` on MSVC.

The original PR which disabled these, https://github.com/rust-lang/rust/pull/62897, only mentions them being broken on i686. ~~let's still make sure the rest of windows is supported.~~ Let's see if we can enable this for msvc now (32-bit and 64-bit).

r? `@jieyouxu`

try-job: x86_64-msvc
try-job: i686-msvc
try-job: i686-mingw
try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
try-job: dist-x86_64-msvc
try-job: dist-i686-msvc
2024-12-25 14:14:47 +00:00
jyn
c880e8bbcb Run tests/ui/backtrace/std-backtrace.rs on MSVC.
The original PR which disabled these only mentions them being broken on
i686 msvc. Let's try to see if we can reenable this test for msvc (both
32-bit and 64-bit).
2024-12-25 20:44:20 +08:00
bors
f432d5dcb5 Auto merge of #134756 - jieyouxu:rollup-suec48x, r=jieyouxu
Rollup of 3 pull requests

Successful merges:

 - #134743 (Default to short backtraces for dev builds of rustc itself)
 - #134750 (Update `#[coverage(..)]` attribute error messages to match the current implementation)
 - #134751 (Enable LSX feature for LoongArch OpenHarmony target)

r? `@ghost`
`@rustbot` modify labels: rollup
2024-12-25 11:25:55 +00:00
Ralf Jung
35f10b1e03 we generally make later flags overwrite earlier flags, so remove some logic guarding just against that 2024-12-25 10:50:48 +01:00
Ralf Jung
b109091cfd remove some flags that have been hard errors for a while 2024-12-25 10:50:48 +01:00
Ralf Jung
2de456151a show an error on some invalid flag combinations: TB + permissive provenance; strict provenance + native calls 2024-12-25 10:50:48 +01:00
许杰友 Jieyou Xu (Joe)
d04f8bd00c
Rollup merge of #134751 - heiher:loong-ohos-lsx, r=jieyouxu
Enable LSX feature for LoongArch OpenHarmony target
2024-12-25 17:25:59 +08:00
许杰友 Jieyou Xu (Joe)
db3404a896
Rollup merge of #134750 - Zalathar:coverage-attr-errors, r=jieyouxu
Update `#[coverage(..)]` attribute error messages to match the current implementation

The allowed positions for `#[coverage(..)]` attributes were expanded by #126721, but the corresponding error messages were never updated to reflect the new behaviour.

Part of #134749.
2024-12-25 17:25:58 +08:00
许杰友 Jieyou Xu (Joe)
aef9d6b0a8
Rollup merge of #134743 - jyn514:rustc-dev-short-backtraces, r=jieyouxu
Default to short backtraces for dev builds of rustc itself

A dev build almost certainly means that whoever's built the compiler has the opportunity to rerun it to collect a more complete trace. So we don't need to default to a complete trace; we should hide irrelevant details by default.
2024-12-25 17:25:58 +08:00
bors
a0a5c42346 Auto merge of #134738 - clubby789:forbid-output-ui, r=jieyouxu
compiletest: Support `forbid-output` in UI tests

The `forbid-output` directive is currently only run in incremental tests (although no incremental tests use it). There are some UI tests 'using' it, but it's doing nothing 😄 Let's fix this

Will also PR the dev guide to note this.

dev-guide PR: https://github.com/rust-lang/rustc-dev-guide/pull/2171
2024-12-25 08:46:20 +00:00
Zalathar
e48fc62ce0 Un-redact one occurrence of "coverage attribute not allowed here" 2024-12-25 19:23:48 +11:00
Zalathar
db02b1d3e9 Rewrite the error-code docs for coverage attributes [E0788] 2024-12-25 19:23:48 +11:00
WANG Rui
652e48b38d Enable LSX feature for LoongArch OpenHarmony target 2024-12-25 14:08:22 +08:00