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 13 pull requests #82142

Closed
wants to merge 27 commits into from
Closed

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

vandenheuvel and others added 27 commits February 13, 2021 14:13
rest in peace match bool <3
Changed 'a an exception' to 'an exception'
- Add a "Safety" section, edit formatting for clarity
- Add missing punctuation in code comments
Previously, there two different ways to encode the same info: `None` or
`Some(&[])`. Now there is only one way, `&[]`.
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
…ostics_regression_test, r=Mark-Simulacrum

Add match pattern diagnostics regression test

Closes rust-lang#72377 by adding a regression test.

This test case fails on stable but now works on beta and nightly. It *should* have worked already for years, the crucial point whether it is mentioned that some uncovered patterns are not explicitly mentioned.
const_generics: Dont evaluate array length const when handling errors

Fixes rust-lang#79518
Fixes rust-lang#78246

cc ``@lcnr``

This was ICE'ing because we dont pass in the correct ``ParamEnv`` which meant that there was no ``Self: Foo`` predicate to make ``Self::Assoc`` well formed which caused an ICE when trying to normalize ``Self::Assoc`` in the mir interpreter

r? ``@varkor``
Fix typos in BTreeSet::{first, last} docs

map -> set
…ievink

Fixed minor typo in catch_unwind docs

Changed "a an exception" to "an exception" inside of the `std::panic::catch_unwind` docs.
Edit `rustc_arena::DropArena` docs

- Add a "Safety" section, edit formatting for clarity
- Add missing punctuation in code comments
Add tests for Atomic*::fetch_{min,max}

This ensures that all atomic operations except for fences are tested. This has been useful to test my work on using atomic instructions for atomic operations in cg_clif instead of a global lock.
Fix a typo

This pull request fixes a typo.
…mulacrum

Remove unnecessary `Option` in `default_doc`

Previously, there were two different ways to encode the same info: `None` or
`Some(&[])`. Now there is only one way, `&[]`.
Fix typo in link to CreateSymbolicLinkW documentation.
Remove redundant bool_to_option feature gate
Update link for extern prelude.

There was some reorganization in the reference as part of rust-lang/reference#937.
@rustbot rustbot added the rollup A PR which is a rollup label Feb 15, 2021
@JohnTitor
Copy link
Member Author

@bors r+ p=13 rollup=never

@bors
Copy link
Contributor

bors commented Feb 15, 2021

📌 Commit d010aaa has been approved by JohnTitor

@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 Feb 15, 2021
@bors
Copy link
Contributor

bors commented Feb 15, 2021

⌛ Testing commit d010aaa with merge 3dcb2da54f5c539dbc139f24c2bb17f3e621ab42...

@rust-log-analyzer
Copy link
Collaborator

The job arm-android failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] core test:false 22.073
[RUSTC-TIMING] rustc_std_workspace_core test:false 0.044
   Compiling core v0.0.0 (/checkout/library/core)
[RUSTC-TIMING] corebenches test:true 31.015
error: linking with `/android/ndk/arm-14/bin/arm-linux-androideabi-clang` failed: exit code: 1
  |
  = note: "/android/ndk/arm-14/bin/arm-linux-androideabi-clang" "-Wl,--as-needed" "-Wl,-z,noexecstack" "-Wl,--allow-multiple-definition" "-Wl,--eh-frame-hdr" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-linux-androideabi/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.0.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.1.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.10.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.11.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.12.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.13.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.14.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.15.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.2.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.3.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.4.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.5.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.6.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.7.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.8.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.9.rcgu.o" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c" "-Wl,--gc-sections" "-pie" "-Wl,-zrelro" "-Wl,-znow" "-Wl,-O1" "-nodefaultlibs" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/build/compiler_builtins-2133efb765af716a/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-linux-androideabi/lib" "-Wl,-Bstatic" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/librand-83d273a401a73704.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/librand_chacha-6ccbebb741227e32.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/libppv_lite86-8ee590357a7fb0e0.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/librand_core-421c0cefac45fb47.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/libgetrandom-968b2679b2961e8d.rlib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-linux-androideabi/lib" "-Wl,-Bdynamic" "-ltest-d717478ba0948505" "-Wl,--start-group" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-linux-androideabi/lib" "-lstd-4b0babc5e76a3aa0" "-Wl,--end-group" "-Wl,-Bstatic" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-linux-androideabi/lib/libcompiler_builtins-97255b8f85658e0a.rlib" "-Wl,-Bdynamic" "-ldl" "-llog" "-lgcc" "-lc" "-lm" "-Wl,-rpath,$ORIGIN/../lib"
  = note: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.14.rcgu.o:coretests.4puksxbp-cgu.14:function core::ops::function::FnOnce::call_once::h4d0b1fe529611829: error: undefined reference to '__sync_fetch_and_umin_4'
          /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.14.rcgu.o:coretests.4puksxbp-cgu.14:function core::ops::function::FnOnce::call_once::h4d0b1fe529611829: error: undefined reference to '__sync_fetch_and_umin_4'
          /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.14.rcgu.o:coretests.4puksxbp-cgu.14:function core::ops::function::FnOnce::call_once::h55e51d6ca47e02b4: error: undefined reference to '__sync_fetch_and_max_4'
          /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.14.rcgu.o:coretests.4puksxbp-cgu.14:function core::ops::function::FnOnce::call_once::h55e51d6ca47e02b4: error: undefined reference to '__sync_fetch_and_max_4'
          /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.14.rcgu.o:coretests.4puksxbp-cgu.14:function core::ops::function::FnOnce::call_once::h88d92829d3c4f031: error: undefined reference to '__sync_fetch_and_min_4'
          /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.14.rcgu.o:coretests.4puksxbp-cgu.14:function core::ops::function::FnOnce::call_once::h88d92829d3c4f031: error: undefined reference to '__sync_fetch_and_min_4'
          /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.14.rcgu.o:coretests.4puksxbp-cgu.14:function core::ops::function::FnOnce::call_once::h90aee5b362338950: error: undefined reference to '__sync_fetch_and_umax_4'
          /checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/coretests-362706e43a00c62c.coretests.4puksxbp-cgu.14.rcgu.o:coretests.4puksxbp-cgu.14:function core::ops::function::FnOnce::call_once::h90aee5b362338950: error: undefined reference to '__sync_fetch_and_umax_4'
          clang50: error: linker command failed with exit code 1 (use -v to see invocation)

error: aborting due to previous error

[RUSTC-TIMING] coretests test:true 65.971
[RUSTC-TIMING] coretests test:true 65.971
error: could not compile `core`

To learn more, run the command again with --verbose.


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "arm-linux-androideabi" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/library/test/Cargo.toml" "-p" "core" "--"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test --host= --target arm-linux-androideabi
Build completed unsuccessfully in 0:36:26

@bors
Copy link
Contributor

bors commented Feb 15, 2021

💔 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 Feb 15, 2021
@JohnTitor JohnTitor closed this Feb 15, 2021
@JohnTitor JohnTitor deleted the rollup-l6wtzio branch February 15, 2021 14:21
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.