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 #87847

Closed
wants to merge 16 commits into from
Closed

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

syvb and others added 16 commits August 3, 2021 19:06
The v0 mangling includes an instantiating crate in a mangled name,
which crates a false positive match for a word `panic`.
Rename crate name / test case to avoid the issue.
I was reading through source code to try to learn more about the language and how to make the most of it when I ran into a small typo, so I figured I'd offer up a fix! I'm pretty new now, but hopefully I can offer up more substantial changes later. :D
The closing backtick was outside the closing bracket,
which is why the intra-doc link wasn't working.
…r=JohnTitor

Fix a layout possible miscalculation in `alloc::RawVec`

A layout miscalculation could happen in `RawVec` when used with a type whose size isn't a multiple of its alignment. I don't know if such type can exist in Rust, but the Layout API provides ways to manipulate such types. Anyway, it is better to calculate memory size in a consistent way.
…rk-Simulacrum

Add x.py option to --force-rerun compiletest tests

This can be used like `./x.py test src/test/ui/abi/ --force-rerun`, and is useful when verifying that newly blessed tests don't change between test runs (such as due to being dependent on the current time or memory layout or RNG), without needing to change the test file or find the right file in `build` to remove.
Make vec-shrink-panic test compatible with v0 mangling

The v0 mangling includes an instantiating crate in a mangled name,
which crates a false positive match for a word `panic`.
Rename crate name / test case to avoid the issue.
Fix typo -- "The" -> "They"

I was reading through source code to try to learn more about the language and how to make the most of it when I ran into a small typo, so I figured I'd offer up a fix! I'm pretty new now, but hopefully I can offer up more substantial changes later. :D
Fix small typo

The closing backtick was outside the closing bracket,
which is why the intra-doc link wasn't working.
Document that fs::read_dir skips . and ..

Hi,

I think this is worth noting in the docs since it differs from POSIX `readdir`. I didn’t put it under platform-specific notes because it seems to be consistent across platforms, and changing this behavior in the future could cause pretty nasty bugs.

Thanks!
…=dtolnay

Fix intra doc link in hidden doc of Iterator::__iterator_get_unchecked

Recently, I edited the import list of the `core::iter::traits::iterator` module (in rust-lang#85874). This results in a broken intra doc link in a hidden documentation with the effect that `RUSTDOCFLAGS='--document-private-items --document-hidden-items' x doc library/std` fails. (This can be worked around by adding `-Arustdoc::broken-intra-doc-links`; still, it’s a broken link so let’s fix it.)

`@rustbot` label C-cleanup, T-libs
@rustbot rustbot added the rollup A PR which is a rollup label Aug 7, 2021
@JohnTitor
Copy link
Member Author

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Aug 7, 2021

📌 Commit da7ada4 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 Aug 7, 2021
@bors
Copy link
Contributor

bors commented Aug 7, 2021

⌛ Testing commit da7ada4 with merge 5fa8a8bd4dc05183c807e9fc2d236adc8aabd13b...

@rust-log-analyzer
Copy link
Collaborator

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)
failures:

---- [ui] ui/sanitize/hwaddress.rs stdout ----

error: test compilation failed although it shouldn't!
status: exit status: 1
command: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/sanitize/hwaddress.rs" "-Zthreads=1" "--target=aarch64-unknown-linux-gnu" "--error-format" "json" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zemit-future-incompat-report" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a" "-A" "unused" "-Crpath" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "-Z" "sanitizer=hwaddress" "-O" "-g" "-C" "codegen-units=16" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: linking with `cc` failed: exit status: 1
   |
   = note: "cc" "-Wl,-Bstatic" "-Wl,--whole-archive" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-nightly_rt.hwasan.a" "-Wl,--no-whole-archive" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.0.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.1.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.10.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.11.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.2.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.3.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.4.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.5.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.6.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.7.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.8.rcgu.o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.9.rcgu.o" "-Wl,--as-needed" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/auxiliary" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib" "-Wl,--start-group" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib" "-Wl,-Bdynamic" "-lstd-8edb37b21b5c699b" "-Wl,--end-group" "-Wl,-Bstatic" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcompiler_builtins-3ffc48c056801c6f.rlib" "-Wl,-Bdynamic" "-lgcc_s" "-lutil" "-lrt" "-lpthread" "-lm" "-ldl" "-lc" "-Wl,--eh-frame-hdr" "-Wl,-znoexecstack" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib" "-o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a" "-Wl,--gc-sections" "-pie" "-Wl,-zrelro" "-Wl,-znow" "-Wl,-O1" "-nodefaultlibs" "-Wl,-rpath,$ORIGIN/../../../../stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib" "-Wl,--enable-new-dtags"
   = note: /checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.4.rcgu.o: in function `core::result::Result<T,E>::unwrap_unchecked':
           /checkout/library/core/src/result.rs:1113:(.text._ZN4core6result19Result$LT$T$C$E$GT$16unwrap_unchecked17ha4d383540c7b9fc6E+0x94): relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against `.rodata..L.hwasan.7'
           /checkout/library/core/src/result.rs:1113:(.text._ZN4core6result19Result$LT$T$C$E$GT$16unwrap_unchecked17ha4d383540c7b9fc6E+0x98): relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against `.data.rel.ro..L.hwasan.15'
           /checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/sanitize/hwaddress/a.hwaddress.ba23a7fd-cgu.4.rcgu.o: in function `core::result::Result<T,E>::unwrap':
           /checkout/library/core/src/result.rs:1299:(.text._ZN4core6result19Result$LT$T$C$E$GT$6unwrap17h77cb76fe598386c4E+0x10): relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against `.rodata..L.hwasan.9'
           /checkout/library/core/src/result.rs:1299:(.text._ZN4core6result19Result$LT$T$C$E$GT$6unwrap17h77cb76fe598386c4E+0x14): relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against `.data.rel.ro..L.hwasan.11'
           /checkout/library/core/src/result.rs:1299:(.text._ZN4core6result19Result$LT$T$C$E$GT$6unwrap17h77cb76fe598386c4E+0x18): relocation truncated to fit: R_AARCH64_ADR_PREL_PG_HI21 against `.data.rel.ro..L.hwasan.1'
           collect2: error: ld returned 1 exit status

error: aborting due to previous error


---

Some tests failed in compiletest suite=ui mode=ui host=aarch64-unknown-linux-gnu target=aarch64-unknown-linux-gnu


command did not execute successfully: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-aarch64-unknown-linux-gnu" "--suite" "ui" "--mode" "ui" "--target" "aarch64-unknown-linux-gnu" "--host" "aarch64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--llvm-version" "12.0.1-rust-1.56.0-nightly" "--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 debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hellonew hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink libdriver lineeditor linker lto 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 object objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always"


Build completed unsuccessfully in 0:19:49

@bors
Copy link
Contributor

bors commented Aug 7, 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 Aug 7, 2021
@JohnTitor JohnTitor closed this Aug 7, 2021
@JohnTitor JohnTitor deleted the rollup-res5pt3 branch August 7, 2021 16:12
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.

None yet