Rollup of 7 pull requests #113885

matthiaskrgr · 2023-07-20T11:03:02Z

Successful merges:

rustdoc: fix position of default in method rendering #110765 (rustdoc: fix position of default in method rendering)
Permit pre-evaluated constants in simd_shuffle #113529 (Permit pre-evaluated constants in simd_shuffle)
Support --print KIND=PATH command line syntax #113780 (Support --print KIND=PATH command line syntax)
Avoid another gha group nesting #113800 (Avoid another gha group nesting)
Add Foreign, Never, FnDef, Closure and Generator tys to SMIR #113827 (Add Foreign, Never, FnDef, Closure and Generator tys to SMIR)
new solver: don't consider blanket impls multiple times #113835 (new solver: don't consider blanket impls multiple times)
Remove outdated Firefox-specific CSS for search's crate selector appearance #113883 (Remove outdated Firefox-specific CSS for search's crate selector appearance)

r? @ghost
@rustbot modify labels: rollup

This introduces a bit of code duplication, but we don't have the build_output_filenames in the CrateName arm and this seems a little cleaner overall.

…tor appearance (padding) to look identical on Firefox. New versions of Firefox appear to have changed behavior to agree with Chrome.

Add Foreign, Never, FnDef, Closure and Generator tys to SMIR r? `@oli-obk`

…ng-self-ty, r=compiler-errors new solver: don't consider blanket impls multiple times only consider candidates which rely on the self type in `assemble_candidates_after_normalizing_self_ty`. r? `@compiler-errors`

…ctor-padding, r=GuillaumeGomez Remove outdated Firefox-specific CSS for search's crate selector appearance Remove adjustments that used to be necessary for search's crate selector appearance (padding) to look identical on Firefox. New versions of Firefox appear to have changed behavior to agree with Chrome. As briefly discussed in rust-lang#98855 (comment) r? `@GuillaumeGomez`

matthiaskrgr · 2023-07-20T11:03:20Z

@bors r+ rollup=never p=7

bors · 2023-07-20T11:03:22Z

📌 Commit 0de39bf has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-07-20T12:18:06Z

⌛ Testing commit 0de39bf with merge e84ea00a2ad212b7e01e86b115e0ca6427224069...

bors · 2023-07-20T12:21:37Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-07-20T12:24:22Z

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

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

matthiaskrgr · 2023-07-20T12:35:18Z

@bors retry network failure
warning: spurious network error (3 tries remaining): [6] Couldn't resolve host name (Could not resolve host: static.crates.iocrates)

bors · 2023-07-20T14:17:38Z

⌛ Testing commit 0de39bf with merge 46ce581bf84c67ffdcda80b523aa0751da1b6dd0...

rust-log-analyzer · 2023-07-20T15:05:00Z

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

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


Build completed unsuccessfully in 0:44:20
error: make failed
status: exit status: 2
command: cd "/checkout/tests/run-make/print-cfg" && AR="ar" CC="cc -ffunction-sections -fdata-sections -fPIC" CXX="c++ -ffunction-sections -fdata-sections -fPIC" HOST_RPATH_DIR="/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/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 core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwarflinkerparallel dwp engine executionengine extensions filecheck frontendhlsl frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo 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 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 transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xray" LLVM_FILECHECK="/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin/FileCheck" PYTHON="/usr/bin/python3" RUSTC="/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" RUSTDOC="/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustdoc" RUST_BUILD_STAGE="stage2-aarch64-unknown-linux-gnu" RUST_DEMANGLER="/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-tools-bin/rust-demangler" S="/checkout" TARGET="aarch64-unknown-linux-gnu" TARGET_RPATH_DIR="/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib" TMPDIR="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg" "make"
--- stdout -------------------------------
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg  --print cfg | "/checkout/src/etc/cat-and-grep.sh" unix
[[[ begin stdout ]]]
overflow_checks
panic="unwind"
target_abi=""
target_arch="aarch64"
target_arch="aarch64"
target_endian="little"
target_env="gnu"
target_family="unix"
target_feature="neon"
target_has_atomic="128"
target_has_atomic="16"
target_has_atomic="32"
target_has_atomic="64"
target_has_atomic="64"
target_has_atomic="8"
target_has_atomic="ptr"
target_has_atomic_equal_alignment="128"
target_has_atomic_equal_alignment="16"
target_has_atomic_equal_alignment="32"
target_has_atomic_equal_alignment="64"
target_has_atomic_equal_alignment="8"
target_has_atomic_equal_alignment="ptr"
target_has_atomic_load_store="128"
target_has_atomic_load_store="16"
target_has_atomic_load_store="32"
target_has_atomic_load_store="64"
target_has_atomic_load_store="64"
target_has_atomic_load_store="8"
target_has_atomic_load_store="ptr"
target_os="linux"
target_pointer_width="64"
target_thread_local
target_vendor="unknown"


[[[ end stdout ]]]
# Backend-independent, printed by rustc_driver_impl/src/lib.rs
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg  --target x86_64-pc-windows-gnu --print cfg=/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg/cfg.txt
"/checkout/src/etc/cat-and-grep.sh" windows < /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg/cfg.txt
[[[ begin stdout ]]]
overflow_checks
panic="unwind"
target_abi=""
target_arch="x86_64"
target_arch="x86_64"
target_endian="little"
target_env="gnu"
target_family="windows"
target_feature="fxsr"
target_feature="sse"
target_feature="sse2"
target_has_atomic="16"
target_has_atomic="32"
target_has_atomic="64"
target_has_atomic="8"
target_has_atomic="8"
target_has_atomic="ptr"
target_has_atomic_equal_alignment="16"
target_has_atomic_equal_alignment="32"
target_has_atomic_equal_alignment="64"
target_has_atomic_equal_alignment="8"
target_has_atomic_equal_alignment="ptr"
target_has_atomic_load_store="16"
target_has_atomic_load_store="32"
target_has_atomic_load_store="64"
target_has_atomic_load_store="8"
target_has_atomic_load_store="8"
target_has_atomic_load_store="ptr"
target_os="windows"
target_pointer_width="64"
target_vendor="pc"


[[[ end stdout ]]]
# Printed from CodegenBackend trait impl in rustc_codegen_llvm/src/lib.rs
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg  --print relocation-models=/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg/relocation-models.txt
"/checkout/src/etc/cat-and-grep.sh" dynamic-no-pic < /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg/relocation-models.txt
[[[ begin stdout ]]]
    static
    pic
    pie
    dynamic-no-pic
    dynamic-no-pic
    ropi
    rwpi
    ropi-rwpi



[[[ end stdout ]]]
# Printed by compiler/rustc_codegen_llvm/src/llvm_util.rs
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg  --target wasm32-unknown-unknown --print target-features=/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg/target-features.txt
"/checkout/src/etc/cat-and-grep.sh" reference-types < /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg/target-features.txt
[[[ begin stdout ]]]
Features supported by rustc for this target:
    atomics             - Enable Atomics.
    bulk-memory         - Enable bulk memory operations.
    exception-handling  - Enable Wasm exception handling.
    multivalue          - Enable multivalue blocks, instructions, and functions.
    mutable-globals     - Enable mutable globals.
    nontrapping-fptoint - Enable non-trapping float-to-int conversion operators.
    reference-types     - Enable reference types.
    relaxed-simd        - Enable relaxed-simd instructions.
    sign-ext            - Enable sign extension operators.
    simd128             - Enable 128-bit SIMD.
    crt-static          - Enables C Run-time Libraries to be statically linked.
Code-generation features supported by LLVM for this target:
    extended-const      - Enable extended const expressions.
    tail-call           - Enable tail call instructions.


Use +feature to enable a feature, or -feature to disable it.
For example, rustc -C target-cpu=mycpu -C target-feature=+feature1,-feature2

Code-generation features cannot be used in cfg or #[target_feature],
and may be renamed or removed in a future version of LLVM or rustc.


[[[ end stdout ]]]
# Printed by C++ code in rustc_llvm/llvm-wrapper/PassWrapper.cpp
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg  --target x86_64-pc-windows-gnu --print target-cpus=/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg/target-cpus.txt
"/checkout/src/etc/cat-and-grep.sh" native < /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make/print-cfg/print-cfg/target-cpus.txt
[[[ begin stdout ]]]
Available CPUs for this target:
    alderlake
    amdfam10
    athlon
    athlon-4
    athlon-fx
    athlon-mp
    athlon-tbird
    athlon-xp
    athlon64
    athlon64-sse3
    barcelona
    bdver1
    bdver2
    bdver3
    bdver3
    bdver4
    bonnell
    broadwell
    btver1
    btver2
    c3-2
    cannonlake
    cascadelake
    cascadelake
    cooperlake
    core-avx-i
    core-avx2
    corei7
    corei7-avx
    corei7-avx
    emeraldrapids
    geode
    geode
    goldmont
    goldmont-plus
    grandridge
    graniterapids
    haswell
    i486
    i586
    i686
    i686
    icelake-client
    icelake-server
    ivybridge
    k6-2
    k6-3
    k8
    k8-sse3
    k8-sse3
    knl
    knm
    lakemont
    meteorlake
    nehalem
    nocona
    opteron
    opteron-sse3
    penryn
    pentium
    pentium-m
    pentium-mmx
    pentium2
    pentium3
    pentium3m
    pentium4
    pentium4m
    pentiumpro
    prescott
    raptorlake
    rocketlake
    sandybridge
    sapphirerapids
    sierraforest
    silvermont
    skx
    skylake
    skylake-avx512
    slm
    tigerlake
    tremont
    westmere
    winchip-c6
    winchip2
    x86-64         - This is the default target CPU for the current build target (currently x86_64-pc-windows-gnu).
    x86-64-v2
    x86-64-v3
    x86-64-v4
    yonah
    znver1
    znver2
    znver3
    znver4

[[[ end stdout ]]]
Error: cannot match: native
--- stderr -------------------------------
--- stderr -------------------------------
make: *** [Makefile:26: output_to_file] Error 1



failures:

bors · 2023-07-20T15:05:33Z

💔 Test failed - checks-actions

wackbyte and others added 30 commits June 23, 2023 18:39

rustdoc: fix position of default in method rendering

c67aea7

Add tests for default unsafe trait methods

13f58a8

Add test of --print KIND=PATH

85a98b0

Store individual output file name with every PrintRequest

2f01742

Parse --print KIND=PATH command line syntax

6dbe5bc

Disallow overlapping prints to the same location

927a4d6

Move OutFileName writing into rustc_session

11a2b0b

Implement printing to file in print_crate_info

be9881a

Implement printing to file in codegen_backend.print

74b24f3

Implement printing to file in llvm_util

7ea1d4c

Implement printing to file in PassWrapper

e8cd8c6

Implement printing to file for link-args and native-static-libs

8d21674

Add ui test of LLVM print-from-C++ changes

5d84459

Document --print KIND=PATH in Command-line Arguments documentation

4f5242e

Permit pre-evaluated constants in simd_shuffle

9e5a67e

Add Foreign to SMIR

9b32319

Add Never to SMIR

caa01ad

Rename SMIR AdtSubsts to GenericArgs

68077d5

Add FnDef ty to SMIR

e5c0b96

Add Closure ty to SMIR

c5c38cd

Add Generator to SMIR

ed32347

Extract generic_args function

db35f1d

Remove FIXMEs a lot of things need fixes

c5819b2

Add note about writing native-static-libs to file

705e3e3

Create separate match arms for FileNames and CrateNames

4d5134f

This introduces a bit of code duplication, but we don't have the build_output_filenames in the CrateName arm and this seems a little cleaner overall.

Remove adjustments that used to be necessary for search's crate selec…

2009b4a

…tor appearance (padding) to look identical on Firefox. New versions of Firefox appear to have changed behavior to agree with Chrome.

Monomorphize constants before inspecting them

c7428d5

XSimplifiedType to SimplifiedType::X

fdaec57

assembly: only consider blanket impls once

2d99f40

add FIXME

aa28b77

matthiaskrgr added 3 commits July 20, 2023 13:03

Rollup merge of rust-lang#113827 - spastorino:smir-types-4, r=oli-obk

c9bb194

Add Foreign, Never, FnDef, Closure and Generator tys to SMIR r? `@oli-obk`

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 Jul 20, 2023

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 Jul 20, 2023

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 Jul 20, 2023

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 Jul 20, 2023

matthiaskrgr closed this Jul 20, 2023

matthiaskrgr deleted the rollup-yubhkhh branch March 16, 2024 18:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #113885

Rollup of 7 pull requests #113885

matthiaskrgr commented Jul 20, 2023

matthiaskrgr commented Jul 20, 2023

bors commented Jul 20, 2023

bors commented Jul 20, 2023

bors commented Jul 20, 2023

rust-log-analyzer commented Jul 20, 2023

matthiaskrgr commented Jul 20, 2023

bors commented Jul 20, 2023

rust-log-analyzer commented Jul 20, 2023

bors commented Jul 20, 2023

Rollup of 7 pull requests #113885

Rollup of 7 pull requests #113885

Conversation

matthiaskrgr commented Jul 20, 2023

matthiaskrgr commented Jul 20, 2023

bors commented Jul 20, 2023

bors commented Jul 20, 2023

bors commented Jul 20, 2023

rust-log-analyzer commented Jul 20, 2023

matthiaskrgr commented Jul 20, 2023

bors commented Jul 20, 2023

rust-log-analyzer commented Jul 20, 2023

bors commented Jul 20, 2023