Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #99776

Closed
wants to merge 27 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

hoodmane and others added 27 commits July 14, 2022 16:13
Co-authored-by: Guillaume Gomez <[email protected]>
It isn't clear most people other than me and it blocks formatting by
rustfmt.
This reduces the amount of llvm ir lines for intrinsic related code from
23801 to 20478.
…chenkov

Implement set_output_kind for Emscripten linker

This is on top of rust-lang#98149. See also the earlier discussion on rust-lang#98303. With this PR, a crate that specifies that it is a cdylib will compile to a working Emscripten dynamic library without adding any extra cargo, rustc, or linker flags and without fiddling with environment variables.

`@sbc100`

r? `@petrochenkov`
…onst-generics, r=oli-obk

Deeply deny fn and raw ptrs in const generics

I think this is right -- just because we wrap a fn ptr in a wrapper type does not mean we should allow it in a const parameter.

We now reject both of these in the same way:

```
#![feature(adt_const_params)]

#[derive(Eq, PartialEq)]
struct Wrapper();

fn foo<const W: Wrapper>() {}

fn foo2<const F: fn()>() {}
```

This does regress one test (`src/test/ui/consts/refs_check_const_eq-issue-88384.stderr`), but I'm not sure it should've passed in the first place.

cc: `@b-naber` who introduced that test^
fixes rust-lang#99641
…gillot

Prefer visibility map parents that are not `doc(hidden)` first

Far simpler approach to rust-lang#98876.

This only fixes the case where the parent is `doc(hidden)`, not where the child is `doc(hidden)` since I don't know how to get the attrs on the import statement given a `ModChild`... I'll try to follow up with that, but this is a good first step.
…llaumeGomez

Add a clickable link to the layout section

The layout section (activated by `--show-type-layout`) is currently not linkable to (outside of chrome's link to text feature). This PR makes it linkable via `#layout`.
Remove dead code from cg_llvm

Found while working on rust-lang#97485
…std-build, r=jyn514

Don't build std for *-uefi targets

rust-lang#97322
…jorn3

Sync rustc_codegen_cranelift

I did a large refactoring of the intrinsics module to remove the intrinsic_match macro which is not very clear to other people. This also enables rustfmt to run on this code. While I already did a sync yesterday, I am going to do another sync again to avoid potential conflicts as those will likely be painful to resolve.

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
…k, r=Urgau

Update pulldown-cmark version to 0.9.2 (fixes url encoding for some chars)

Fixes rust-lang#97125.

r? `@Dylan-DPC`
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler 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. labels Jul 26, 2022
@rustbot rustbot added the rollup A PR which is a rollup label Jul 26, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Jul 26, 2022

📌 Commit 636b27e has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 26, 2022
@bors
Copy link
Contributor

bors commented Jul 26, 2022

⌛ Testing commit 636b27e with merge 58eb63566b23b7c16490ce14b01413378e031d51...

@bors
Copy link
Contributor

bors commented Jul 26, 2022

💔 Test failed - checks-actions

@bors 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 26, 2022
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
test [ui] src/test/ui/suggestions/dont-suggest-ref/simple.rs ... ok
test [ui] src/test/ui/structs-enums/variant-structs-trivial.rs ... ok
test [ui] src/test/ui/structs-enums/type-sizes.rs ... ok
test [ui] src/test/ui/structs-enums/unit-like-struct.rs ... ok
test [ui] src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-parent.rs ... ok
test [ui] src/test/ui/suggestions/fn-ctor-passed-as-arg-where-it-should-have-been-called.rs ... ok
test [ui] src/test/ui/suggestions/fn-needing-specified-return-type-param.rs ... ok
test [ui] src/test/ui/suggestions/fn-missing-lifetime-in-item.rs ... ok
test [ui] src/test/ui/suggestions/field-has-method.rs ... ok
test [ui] src/test/ui/suggestions/field-has-method.rs ... ok
test [ui] src/test/ui/suggestions/dont-suggest-doc-hidden-variant-for-enum/hidden-child.rs ... ok
test [ui] src/test/ui/structs/large-records.rs ... ok
test [ui] src/test/ui/suggestions/if-let-typo.rs ... ok
test [ui] src/test/ui/suggestions/field-access.rs ... ok
test [ui] src/test/ui/suggestions/imm-ref-trait-object.rs ... ok
---
---- [ui] src/test/ui/cfg/crt-static-off-works.rs stdout ----

error: test compilation failed although it shouldn't!
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/cfg/crt-static-off-works.rs" "-Zthreads=1" "--target=wasm32-unknown-emscripten" "-O" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/cfg/crt-static-off-works/a.js" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/wasm32-unknown-emscripten/native/rust-test-helpers" "-C" "target-feature=-crt-static" "-Z" "unstable-options" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/cfg/crt-static-off-works/auxiliary"
stdout: none
--- stderr -------------------------------
WARN rustc_codegen_ssa::back::linker Building dynamic executable with -sMAIN_MODULE=2. Dead code elimination may break things. See https://emscripten.org/docs/compiling/Dynamic-Linking.html?highlight=main_module#code-size 
error: linking with `emcc` failed: exit status: 1
   |
   = note: "emcc" "-s" "EXPORTED_FUNCTIONS=[\"_main\"]" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/cfg/crt-static-off-works/a.crt_static_off_works.9a386833-cgu.0.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/cfg/crt-static-off-works/a.2t30dcus8l95j891.rcgu.o" "-L" "/checkout/obj/build/wasm32-unknown-emscripten/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/cfg/crt-static-off-works/auxiliary" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/libstd-0ac7839583e0074b.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/libpanic_unwind-696b6eaa34188a6f.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/librustc_demangle-34a2893d86851892.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/libstd_detect-1e3b162d3dc5a21c.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/libhashbrown-da057e8abfe679c7.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/libminiz_oxide-7a6670a49c7068de.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/libadler-ba5ac73899ee68d1.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/librustc_std_workspace_alloc-deae52698d2735a3.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/libunwind-b1560c864fd3a4a1.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/libcfg_if-a0fbea172501d8a2.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/liblibc-297353a3c10661a4.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/liballoc-b71b12ce2301795a.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/librustc_std_workspace_core-2a3aad12c7daf07b.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/libcore-658f099c4bc7f037.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/libcompiler_builtins-f302f376a525e7f3.rlib" "-l" "c" "-s" "DISABLE_EXCEPTION_CATCHING=0" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-emscripten/lib/self-contained" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/cfg/crt-static-off-works/a.js" "-sMAIN_MODULE=2" "-O2" "-g0" "-sABORTING_MALLOC=0" "-Wl,--fatal-warnings"
   = note: cache:INFO: generating system library: libc.a... (this will be cached in "/emsdk-portable/upstream/emscripten/cache/wasm-pic/libc.a" for subsequent builds)
           cache:INFO:  - ok
           cache:INFO: generating system library: libcompiler_rt.a... (this will be cached in "/emsdk-portable/upstream/emscripten/cache/wasm-pic/libcompiler_rt.a" for subsequent builds)
Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=wasm32-unknown-emscripten
           cache:INFO:  - ok
           cache:INFO: generating system library: libc-wasm.a... (this will be cached in "/emsdk-portable/upstream/emscripten/cache/wasm-pic/libc-wasm.a" for subsequent builds)
           cache:INFO:  - ok
           cache:INFO: generating system library: libc++.a... (this will be cached in "/emsdk-portable/upstream/emscripten/cache/wasm-pic/libc++.a" for subsequent builds)
           cache:INFO:  - ok
           cache:INFO: generating system library: libc++abi.a... (this will be cached in "/emsdk-portable/upstream/emscripten/cache/wasm-pic/libc++abi.a" for subsequent builds)
           cache:INFO:  - ok
           cache:INFO: generating system library: libdlmalloc.a... (this will be cached in "/emsdk-portable/upstream/emscripten/cache/wasm-pic/libdlmalloc.a" for subsequent builds)
           cache:INFO:  - ok
           cache:INFO: generating system library: libpthread_stub.a... (this will be cached in "/emsdk-portable/upstream/emscripten/cache/wasm-pic/libpthread_stub.a" for subsequent builds)
           cache:INFO:  - ok
           cache:INFO: generating system library: libc_rt_wasm.a... (this will be cached in "/emsdk-portable/upstream/emscripten/cache/wasm-pic/libc_rt_wasm.a" for subsequent builds)
           cache:INFO:  - ok
           cache:INFO: generating system library: libsockets.a... (this will be cached in "/emsdk-portable/upstream/emscripten/cache/wasm-pic/libsockets.a" for subsequent builds)
           cache:INFO:  - ok
           cache:INFO: generating system asset: generated_struct_info.json... (this will be cached in "/emsdk-portable/upstream/emscripten/cache/wasm-pic/generated_struct_info.json" for subsequent builds)
           missing function: iprintf
           -1
           exception thrown: RuntimeError: abort(-1). Build with -s ASSERTIONS=1 for more info.,RuntimeError: abort(-1). Build with -s ASSERTIONS=1 for more info.
               at abort (/tmp/tmp6fh1tjp2.js:1561:11)
               at _iprintf (/tmp/tmp6fh1tjp2.js:1801:37)
               at <anonymous>:wasm-function[5]:0x16d
               at main (<anonymous>:wasm-function[6]:0xaf43)
               at Module._main (/tmp/tmp6fh1tjp2.js:1943:60)
               at callMain (/tmp/tmp6fh1tjp2.js:2101:15)
               at doRun (/tmp/tmp6fh1tjp2.js:2162:23)
               at run (/tmp/tmp6fh1tjp2.js:2177:5)
               at runCaller (/tmp/tmp6fh1tjp2.js:2086:19)
               at removeRunDependency (/tmp/tmp6fh1tjp2.js:1536:7)
           emcc: error: '/emsdk-portable/node/14.18.2_64bit/bin/node /tmp/tmp6fh1tjp2.js' failed (1)

error: aborting due to previous error
------------------------------------------

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.