Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Rollup of 8 pull requests#126775

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed

Conversation

@matthiaskrgr
Copy link
Member

Successful merges:

r?@ghost
@rustbot modify labels: rollup

Create a similar rollup

ChrisDentonand others added20 commitsJune 14, 2024 16:12
As long as a pidfd is on a child it can be safely reaped. Taking itwould mean the child would now have to be awaited through its pid, but could alsobe awaited through the pidfd. This could then suffer from a recycling race.
Add PidFd::{kill, wait, try_wait}rust-lang#117957 changed `Child` kill/wait/try_wait to use its pidfd instead of the pid, when one is available.This PR extracts those implementations and makes them available on `PidFd` directly.The `PidFd` implementations differ significantly from the corresponding `Child` methods:* the methods can be called after the child has been reaped, which will result in an error but will be safe. This state is not observable in `Child` unless something stole the zombie child* the `ExitStatus` is not kept, meaning that only the first time a wait succeeds it will be returned* `wait` does not close stdin* `wait` only requires `&self` instead of `&mut self` since there is no state to maintain and subsequent calls are safeTracking issue:rust-lang#82971
Improve conflict marker recovery<!--If this PR is related to an unstable feature or an otherwise tracked effort,please link to the relevant tracking issue here. If you don't know of a relatedtracking issue or there are none, feel free to ignore this.This PR will get automatically assigned to a reviewer. In case you would likea specific user to review your work, you can assign it to them by using    r​? <reviewer name>-->closesrust-lang#113826r? ``@estebank`` since you reviewedrust-lang#115413cc: ``@rben01`` since you opened up the issue in the first place
…, r=ehussAdd `powerpc-unknown-openbsd` maintenance statusAs noted inrust-lang#126451 (comment) `powerpc-unknown-openbsd` is not maintained by the OpenBSD devs. If a maintainer is found this can be updated with their information but we should document the current status and note explicitly that it's different from other OpenBSD targets.
Print the tested value in int_log testsTiny change - from the failures inrust-lang#125016, it would have been nice to see what the tested values were. Update the assertion messages.
Expand `avx512_target_feature` to include VEX variantsAdded 5 new target features for x86: - `AVX-IFMA` - `AVX-NE-CONVERT` - `AVX-VNNI` - `AVX-VNNI_INT8` - `AVX-VNNI_INT16`Both LLVM and GCC already have support for these.See also the [stdarch PR](rust-lang/stdarch#1586)
Make edition dependent `:expr` macro fragment act like the edition-dependent `:pat` fragment doesParse the `:expr` fragment as `:expr_2021` in editions <=2021, and as `:expr` in edition 2024. This is similar to how we parse `:pat` as `:pat_param` in edition <=2018 and `:pat_with_or` in >=2021, and means we can get rid of a span dependency from `nonterminal_may_begin_with`.Specifically, this fixes a theoretical regression since the `expr_2021` macro fragment previously would allow `const {}` if the *caller* is edition 2024. This is inconsistent with the way that the `pat` macro fragment was upgraded, and also leads to surprising behavior when a macro *caller* crate upgrades to edtion 2024, since they may have parsing changes that they never asked for (with no way of opting out of it).This PR also allows using `expr_2021` in all editions. Why was this was disallowed in the first place? It's purely additive, and also it's still feature gated?r? ``@fmease`` ``@eholk`` cc ``@vincenzopalazzo``ccrust-lang#123865Tracking:-rust-lang#123742
…le-temp-dir, r=jieyouxuPass target to inaccessible-temp-dir rmake testThis PR circles back to do the target specific changes in `inaccessible-temp-dir` fromrust-lang#126355. Specifically, this repairs the test on `riscv64gc-unknown-linux-gnu`. (The failure can be viewed inrust-lang#126641 ->https://github.com/rust-lang/rust/actions/runs/9571149616/job/26387537888?pr=126641)We removed this change fromrust-lang#126355 to avoid a merge conflict withrust-lang#126279. (...and, because I hoped that would fix the test instead, but it did not.)## Testing> [!NOTE]> `riscv64gc-unknown-linux-gnu` is a [**Tier 2 with Host Tools** platform](https://doc.rust-lang.org/beta/rustc/platform-support.html), all tests may not necessarily pass! This PR is specifically about the `inaccessible-temp-dir` rmake test.You can test out the job locally:```shDEPLOY=1 ./src/ci/docker/run.sh riscv64gc-gnu````DEPLOY=1` helps reproduce the CI's environment and also avoids the chance of a `llvm-c/BitReader.h` error (detailed inrust-lang#85424 andrust-lang#56650).<details><summary>tests/run-make/inaccessible-temp-dir failure</summary>```bash---- [run-make] tests/run-make/inaccessible-temp-dir stdout -------- [run-make] tests/run-make/inaccessible-temp-dir stdout ----error: rmake recipe failed to completestatus: exit status: 1command: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake_out" && env -u RUSTFLAGS AR="riscv64-linux-gnu-ar" CC="riscv64-linux-gnu-gcc" CC_DEFAULT_FLAGS="-ffunction-sections -fdata-sections -fPIC -march=rv64gc -mabi=lp64d" CXX="riscv64-linux-gnu-g++" CXX_DEFAULT_FLAGS="-ffunction-sections -fdata-sections -fPIC -march=rv64gc -mabi=lp64d" HOST_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/bin" LLVM_COMPONENTS="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen codegentypes core coroutines coverage csky cskyasmparser cskycodegen cskydesc cskydisassembler cskyinfo debuginfobtf debuginfocodeview debuginfodwarf debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwarflinkerclassic dwarflinkerparallel dwp engine executionengine extensions filecheck frontenddriver frontendhlsl frontendoffloading frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo hipstdpar instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink libdriver lineeditor linker loongarch loongarchasmparser loongarchcodegen loongarchdesc loongarchdisassembler loongarchinfo lto m68k m68kasmparser m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts objcopy object objectyaml option orcdebugging orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvtargetmca runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target targetparser textapi textapibinaryreader transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xray" LLVM_FILECHECK="/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" PYTHON="/usr/bin/python3" REMOTE_TEST_CLIENT="/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUSTC_LINKER="riscv64-linux-gnu-gcc" RUSTDOC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" RUST_BUILD_STAGE="stage2-riscv64gc-unknown-linux-gnu" SOURCE_ROOT="/checkout" TARGET_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib" TARGET_RPATH_ENV="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake_out:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake"stdout: none--- stderr -------------------------------command unexpectedly succeeded at line 33Command { cmd: LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake_out:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake_out" "program.rs" "-Ztemps-dir=inaccessible/tmp", stdin: None, drop_bomb: DropBomb { command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc", defused: true, armed_line: 30 } }output status: `exit status: 0`=== STDOUT ====== STDERR ===```</details>
…m, r=spastorino`StaticForeignItem` and `StaticItem` are the sameThe struct `StaticItem` and `StaticForeignItem` are the same, so remove `StaticForeignItem`. Having them be separate is unique to `static` items -- unlike `ForeignItemKind::{Fn,TyAlias}`, which use the normal AST item.r? `@spastorino` or `@oli-obk`
@rustbotrustbot added A-run-makeArea: port run-make Makefiles to rmake.rs O-linuxOperating system: Linux O-unixOperating system: Unix-like S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties. 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. rollupA PR which is a rollup labelsJun 21, 2024
@matthiaskrgr
Copy link
MemberAuthor

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

📌 Commit832109b has been approved bymatthiaskrgr

It is now in thequeue for this repository.

@borsbors removed the S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties. labelJun 21, 2024
@borsbors added the S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion. labelJun 21, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull requestJun 21, 2024
…iaskrgrRollup of 8 pull requestsSuccessful merges: -rust-lang#124101 (Add PidFd::{kill, wait, try_wait}) -rust-lang#126125 (Improve conflict marker recovery) -rust-lang#126481 (Add `powerpc-unknown-openbsd` maintenance status) -rust-lang#126613 (Print the tested value in int_log tests) -rust-lang#126617 (Expand `avx512_target_feature` to include VEX variants) -rust-lang#126700 (Make edition dependent `:expr` macro fragment act like the edition-dependent `:pat` fragment does) -rust-lang#126707 (Pass target to inaccessible-temp-dir rmake test) -rust-lang#126767 (`StaticForeignItem` and `StaticItem` are the same)r? `@ghost``@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

⌛ Testing commit832109b with merge6e3df73...

@rust-log-analyzer
Copy link
Collaborator

The jobdist-aarch64-msvc failed! Check out the build log:(web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
 Documenting std v0.0.0 (C:\a\rust\rust\library\std)error[E0432]: unresolved import `crate::sys::fd`  --> library\std\src\os\linux\process.rs:11:17   |11 | use crate::sys::fd::FileDesc;   |                 ^^ could not find `fd` in `sys`For more information about this error, try `rustc --explain E0432`.error: could not document `std`warning: build failed, waiting for other jobs to finish...[RUSTC-TIMING] std test:false 3.906

@bors
Copy link
Collaborator

💔 Test failed -checks-actions

@borsbors added S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion. labelsJun 21, 2024
@matthiaskrgrmatthiaskrgr deleted the rollup-ydxpehb branchSeptember 1, 2024 17:36
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-run-makeArea: port run-make Makefiles to rmake.rsO-linuxOperating system: LinuxO-unixOperating system: Unix-likerollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@matthiaskrgr@bors@rust-log-analyzer@rustbot@ChrisDenton@the8472@tgross35@oriongonza@sayantn@compiler-errors@Hoverbear

[8]ページ先頭

©2009-2025 Movatter.jp