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 7 pull requests #83928

Closed
wants to merge 21 commits into from

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

petrochenkov and others added 21 commits April 3, 2021 21:49
ori_link contains anchors, path_str does not. It's important that
anchor_failure be passed a link with the anchors still present.
This gets rid of a lot of parameters, as well as fixing a diagnostic
bug.
It's not the range of the full link, it's only a partial range.
Adds a commit with support for i64 simd comparisons for the wasm target
It is tightly connected to `Context` and is primarily used as a field in
`Context`. Thus, it should be next to `Context`.
…aumeGomez

Move `SharedContext` to `context.rs`

It is tightly connected to `Context` and is primarily used as a field in
`Context`. Thus, it should be next to `Context`.
rustc_target: Remove compiler-rt linking hack on Android

`compiler-rt` did some significant work last year trying to eliminate this kind of duplicated symbols, so the flag may be no longer necessary.
Tested locally with AArch64 Android, seems to work, CI will check the rest of the targets.
rustc_target: Rely on defaults more in target specs
rustdoc: Use DiagnosticInfo in more parts of intra-doc links

This makes the code a lot less verbose.

This is separated into lots of tiny commits because it was easier for me that way, but the overall diff isn't that big if you want to read it at once.

r? `@bugadani`
Update LLVM to support more wasm simd ops

Adds a commit with support for i64 simd comparisons for the wasm target
…=lcnr

Fix typo in TokenStream documentation
Update cargo

3 commits in 3c44c3c4b7900b8b13c85ead25ccaa8abb7d8989..65d57e6f384c2317f76626eac116f683e2b63665
2021-03-31 21:21:15 +0000 to 2021-04-04 15:07:52 +0000
- Fix typo in contrib docs. (rust-lang/cargo#9328)
- fix clippy warnings (rust-lang/cargo#9323)
- Add -Zallow-features to match rustc's -Z (rust-lang/cargo#9283)
@rustbot rustbot added the rollup A PR which is a rollup label Apr 6, 2021
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 6, 2021

📌 Commit 0eeaf7a has been approved by Dylan-DPC

@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 Apr 6, 2021
@bors
Copy link
Contributor

bors commented Apr 6, 2021

⌛ Testing commit 0eeaf7a with merge cd93e404b0da4ddfa83aada35cf55fa6132d4910...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] addr2line test:false 0.415
[RUSTC-TIMING] core test:false 17.518
[RUSTC-TIMING] gimli test:false 5.197
[RUSTC-TIMING] object test:false 10.336
error: linking with `/android/ndk/arm-14/bin/arm-linux-androideabi-clang` failed: exit status: 1
  |
  = note: "/android/ndk/arm-14/bin/arm-linux-androideabi-clang" "-Wl,--eh-frame-hdr" "-Wl,-znoexecstack" "-Wl,--as-needed" "-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/std-aa02b9ba56c47188.std.1gj5x857-cgu.0.rcgu.o" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/libstd-aa02b9ba56c47188.so" "-Wl,--version-script=/tmp/rustcGcFPjk/list" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/std-aa02b9ba56c47188.550hwdqflrivilit.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/deps/std-aa02b9ba56c47188.f3uuzluee2cbevv.rcgu.o" "-shared" "-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-0cc9b3ede123fcbb/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/arm-linux-androideabi/release/build/profiler_builtins-f00fa99f86511a66/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-linux-androideabi/lib" "-ldl" "-llog" "-lgcc" "-Wl,-Bstatic" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/libpanic_unwind-53a82f532deef78c.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/libminiz_oxide-5ae569e4d71b98f2.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/libadler-480e8a29cd327522.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/libobject-818d6dece30befc6.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/libaddr2line-83e55526cd23350a.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/libgimli-d880f99d5b85d10a.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/librustc_demangle-cd2642fb698e70d6.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/libhashbrown-a9c6975bf97337e1.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/librustc_std_workspace_alloc-12a29a9bfdad4d51.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/libunwind-7de75771c758f0b5.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/libcfg_if-7dbf72bdfaf506c0.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/liblibc-f48e19d6fccfbd3c.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/liballoc-cddf24203f98dfca.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/librustc_std_workspace_core-751cff066ed2ddff.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/tmp/rustcGcFPjk/libcore-61aecf05f20b0be0.rlib" "-Wl,--no-whole-archive" "/tmp/rustcGcFPjk/libcompiler_builtins-fa77a8df7f01d459.rlib" "-Wl,-Bdynamic" "-lc" "-lm" "-Wl,-rpath,$ORIGIN/../lib"
  = note: /android/ndk/arm-14/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error: /tmp/rustcGcFPjk/libcompiler_builtins-fa77a8df7f01d459.rlib(compiler_builtins-fa77a8df7f01d459.compiler_builtins.1pwrvrkl-cgu.55.rcgu.o): multiple definition of '__aeabi_uidivmod'
          /android/ndk/arm-14/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /android/ndk/arm-14/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/libgcc.a(_udivsi3.o): previous definition here
          /android/ndk/arm-14/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error: /tmp/rustcGcFPjk/libcompiler_builtins-fa77a8df7f01d459.rlib(compiler_builtins-fa77a8df7f01d459.compiler_builtins.1pwrvrkl-cgu.55.rcgu.o): multiple definition of '__aeabi_uldivmod'
          /android/ndk/arm-14/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /android/ndk/arm-14/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/libgcc.a(_aeabi_uldivmod.o): previous definition here
          clang50: error: linker command failed with exit code 1 (use -v to see invocation)

error: aborting due to previous error

[RUSTC-TIMING] std test:false 25.798
[RUSTC-TIMING] std test:false 25.798
error: could not compile `std`

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" "build" "--target" "arm-linux-androideabi" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace profiler compiler-builtins-c" "--manifest-path" "/checkout/library/test/Cargo.toml" "--message-format" "json-render-diagnostics"
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host= --target arm-linux-androideabi,armv7-linux-androideabi,thumbv7neon-linux-androideabi,i686-linux-android,aarch64-linux-android,x86_64-linux-android
Build completed unsuccessfully in 0:19:01

@bors
Copy link
Contributor

bors commented Apr 6, 2021

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 6, 2021
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 6, 2021
@bors
Copy link
Contributor

bors commented Apr 8, 2021

☔ The latest upstream changes (presumably #83866) made this pull request unmergeable. Please resolve the merge conflicts.

@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-0svdyhk branch April 8, 2021 10:18
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.