Rollup of 9 pull requests #74151

Manishearth · 2020-07-08T15:27:37Z

Successful merges:

adjust ub-enum test to be endianess-independent #73989 (adjust ub-enum test to be endianess-independent)
Use relative path for local links to primitives #74077 (Use relative path for local links to primitives)
rustdoc: Rename invalid_codeblock_attribute lint to be plural #74131 (rustdoc: Rename invalid_codeblock_attribute lint to be plural)
Update books #74135 (Update books)
Fix broken link in rustdocdoc #74136 (Fix broken link in rustdocdoc)
Liballoc use vec instead of vector #74142 (Liballoc use vec instead of vector)
Try remove unneeded ToString import in liballoc slice #74143 (Try remove unneeded ToString import in liballoc slice)
Update rust-installer to latest version #74145 (Update rust-installer to latest version)
update miri #74146 (update miri)

Failed merges:

Else, links to `char::foo` would point into `/path/to/src/libcore/std/primitive.char.html#method.foo`. Split out from rust-lang#73804.

They both produce less-than-desirable output (links going to docs.rust-lang.org), but I haven't figured out yet how to assert about them properly.

For the two of these tests that have a local `char` to link to, this behavior isn't what's expected, but is what's happening presently.

This reverts commit ee3a0f8.

This pulls in a fix for the install script on some tr(1) implementations, as well as an update to use `anyhow` instead of `failure` for error handling.

Keep congruency with other parts, full word vector is rarely used.

@cuviper

adjust ub-enum test to be endianess-independent @cuviper noted that our test fails on "other" endianess systems (I never know which is which^^), so let's fix that.

…link, r=jyn514 Use relative path for local links to primitives Else, links to `char::foo` would point into `/path/to/src/libcore/std/primitive.char.html#method.foo`. Split out from rust-lang#73804.

@GuillaumeGomez

…ttributes_name, r=GuillaumeGomez rustdoc: Rename invalid_codeblock_attribute lint to be plural Lint names should be plural as per the lint naming conventions: https://github.com/rust-lang/rfcs/blob/master/text/0344-conventions-galore.md#lints r? @GuillaumeGomez

Update books ## book 3 commits in 4e7c00bece1544d409312ec93467beb62b5bd0cb..84a31397b34f9d405df44f2899ff17a4828dba18 2020-06-19 09:39:12 -0400 to 2020-07-04 10:50:18 -0500 - Update Windows install instructions (rust-lang/book#2389) - Update ch01-02-hello-world.md (rust-lang/book#2386) - bump mdbook version in github action (rust-lang/book#2380) ## reference 2 commits in 04d5d5d7ba624b6f5016298451f3a63d557f3260..0ea7bc494f1289234d8800bb9185021e0ad946f0 2020-06-16 15:08:05 -0700 to 2020-07-02 15:33:04 -0700 - Fix mis-capitalization of type name. (rust-lang/reference#844) - Fix name of trait for array indexing. (rust-lang/reference#840) ## embedded-book 1 commits in 616962ad0dd80f34d8b802da038d0aed9dd691bb..94d9ea8460bcbbbfef1877b47cb930260b5849a7 2020-06-23 16:03:45 +0000 to 2020-07-05 14:17:40 +0000 - Note on transformation of static variables by attribute exception (rust-embedded/book#251) ## rust-by-example 1 commits in 6f94ccb48da6fa4ed0031290f21411cf789f7d5e..229c6945a26a53a751ffa4f9cb418388c00029d3 2020-06-20 17:51:30 -0300 to 2020-07-06 10:13:15 -0300 - Modify comments (rust-lang/rust-by-example#1359)

…umeGomez Fix broken link in rustdocdoc The previous link redirects to https://www.rust-lang.org/learn.

Liballoc use vec instead of vector Keep congruency with other parts, full word vector is rarely used.

Try remove unneeded ToString import in liballoc slice

…k-Simulacrum Update rust-installer to latest version This pulls in a fix for the install script on some tr(1) implementations, as well as an update to use `anyhow` instead of `failure` for error handling.

@ghost

update miri Fixes rust-lang#74132 Cc @rust-lang/miri r? @ghost

Manishearth · 2020-07-08T15:28:06Z

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

bors · 2020-07-08T15:28:08Z

📌 Commit ef081d1 has been approved by Manishearth

bors · 2020-07-08T15:28:29Z

⌛ Testing commit ef081d1 with merge 0ed18125187144a8c36c9dca6dcbb3bea8a6555c...

bors · 2020-07-08T16:08:58Z

💔 Test failed - checks-actions

Manishearth · 2020-07-08T16:22:03Z

2020-07-08T16:07:42.9417000Z ------------------------------------------
2020-07-08T16:07:42.9417333Z error: linking with `link.exe` failed: exit code: 1120
2020-07-08T16:07:42.9417576Z   |
2020-07-08T16:07:42.9417780Z thread 'main' panicked at 'Some tests failed', src\tools\compiletest\src\main.rs:344:22
2020-07-08T16:07:42.9417955Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-07-08T16:07:42.9418656Z   = note: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Tools\\MSVC\\14.26.28801\\bin\\HostX64\\x86\\link.exe" "/NOLOGO" "/NXCOMPAT" "/LARGEADDRESSAWARE" "/SAFESEH" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\rustdoc\\intra-link-prim-methods-external-core\\auxiliary\\my-core.my_core.3a1fbbbh-cgu.0.rcgu.o" "/OUT:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\rustdoc\\intra-link-prim-methods-external-core\\auxiliary\\my_core.dll" "/DEF:C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcBZEzZW\\lib.def" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\rustdoc\\intra-link-prim-methods-external-core\\auxiliary\\my-core.41vnijj432q48xyz.rcgu.o" "/OPT:REF,ICF" "/DLL" "/IMPLIB:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\rustdoc\\intra-link-prim-methods-external-core\\auxiliary\\my_core.dll.lib" "/DEBUG" "/NATVIS:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\etc\\intrinsic.natvis" "/NATVIS:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\etc\\liballoc.natvis" "/NATVIS:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\etc\\libcore.natvis" "/NATVIS:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\etc\\libstd.natvis" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\rustdoc\\intra-link-prim-methods-external-core\\auxiliary" "/LIBPATH:D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib"
2020-07-08T16:07:42.9419409Z   = note:    Creating library D:\a\rust\rust\build\i686-pc-windows-msvc\test\rustdoc\intra-link-prim-methods-external-core\auxiliary\my_core.dll.lib and object D:\a\rust\rust\build\i686-pc-windows-msvc\test\rustdoc\intra-link-prim-methods-external-core\auxiliary\my_core.dll.exp
2020-07-08T16:07:42.9419810Z           LINK : error LNK2001: unresolved external symbol __DllMainCRTStartup@12
2020-07-08T16:07:42.9420032Z           D:\a\rust\rust\build\i686-pc-windows-msvc\test\rustdoc\intra-link-prim-methods-external-core\auxiliary\my_core.dll : fatal error LNK1120: 1 unresolved externals
2020-07-08T16:07:42.9420212Z           
2020-07-08T16:07:42.9420299Z 
2020-07-08T16:07:42.9420591Z error: aborting due to previous error
2020-07-08T16:07:42.9420658Z 
2020-07-08T16:07:42.9420916Z 
2020-07-08T16:07:42.9421219Z ------------------------------------------
2020-07-08T16:07:42.9421309Z 
2020-07-08T16:07:42.9421601Z 
2020-07-08T16:07:42.9421681Z 
2020-07-08T16:07:42.9421964Z failures:
2020-07-08T16:07:42.9422103Z     [rustdoc] rustdoc\intra-link-prim-methods-external-core.rs
2020-07-08T16:07:42.9422179Z 
2020-07-08T16:07:42.9422325Z test result: FAILED. 344 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out

RalfJung and others added 25 commits July 3, 2020 13:22

adjust ub-enum test to be endianess-independent

fb9fa5b

Use relative path for local links to primitives in libcore

81fbfc4

Else, links to `char::foo` would point into `/path/to/src/libcore/std/primitive.char.html#method.foo`. Split out from rust-lang#73804.

Add guard to check for local core crate

ee3a0f8

Two new rustdoc tests for intra links

33a5d00

They both produce less-than-desirable output (links going to docs.rust-lang.org), but I haven't figured out yet how to assert about them properly.

build extern docs as well

165aecb

Assert current behavior for links

865b930

For the two of these tests that have a local `char` to link to, this behavior isn't what's expected, but is what's happening presently.

rustdoc: Rename invalid_codeblock_attribute lint to be plural

56fb717

ignore-tidy-linelength for @Has assertions

f258d98

Update books

b50c13c

Revert "Add guard to check for local core crate"

8d267db

This reverts commit ee3a0f8.

Update rust-installer to latest version

32025fd

This pulls in a fix for the install script on some tr(1) implementations, as well as an update to use `anyhow` instead of `failure` for error handling.

Fix broken link in rustdocdoc

dd07774

Liballoc use vec instead of vector

7bc85e2

Keep congruency with other parts, full word vector is rarely used.

Remove unneeded ToString import in liballoc slice

0965443

update miri

512f9e9

Apply #![crate_type = "rlib"] directly to the linker

9366458

Rollup merge of rust-lang#73989 - RalfJung:ub-enum-test, r=oli-obk

f4fcb60

adjust ub-enum test to be endianess-independent @cuviper noted that our test fails on "other" endianess systems (I never know which is which^^), so let's fix that.

Rollup merge of rust-lang#74077 - sethp:docs/fix-intra-doc-primitive-…

b3ab41d

…link, r=jyn514 Use relative path for local links to primitives Else, links to `char::foo` would point into `/path/to/src/libcore/std/primitive.char.html#method.foo`. Split out from rust-lang#73804.

Rollup merge of rust-lang#74136 - JohnTitor:index-page-link, r=Guilla…

4057300

…umeGomez Fix broken link in rustdocdoc The previous link redirects to https://www.rust-lang.org/learn.

Rollup merge of rust-lang#74142 - pickfire:patch-1, r=dtolnay

bed5f7d

Liballoc use vec instead of vector Keep congruency with other parts, full word vector is rarely used.

Rollup merge of rust-lang#74143 - pickfire:patch-2, r=jonas-schievink

32a29e1

Try remove unneeded ToString import in liballoc slice

Rollup merge of rust-lang#74145 - michaelforney:rust-installer, r=Mar…

38e67bd

…k-Simulacrum Update rust-installer to latest version This pulls in a fix for the install script on some tr(1) implementations, as well as an update to use `anyhow` instead of `failure` for error handling.

Rollup merge of rust-lang#74146 - RalfJung:miri, r=RalfJung

ef081d1

update miri Fixes rust-lang#74132 Cc @rust-lang/miri r? @ghost

rustbot added the rollup A PR which is a rollup label Jul 8, 2020

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 8, 2020

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 8, 2020

Manishearth closed this Jul 8, 2020

Manishearth mentioned this pull request Jul 8, 2020

Use relative path for local links to primitives #74077

Merged

Manishearth deleted the rollup-f7yqrc3 branch July 18, 2020 01:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #74151

Rollup of 9 pull requests #74151

Manishearth commented Jul 8, 2020

Manishearth commented Jul 8, 2020

bors commented Jul 8, 2020

bors commented Jul 8, 2020

bors commented Jul 8, 2020

Manishearth commented Jul 8, 2020

Rollup of 9 pull requests #74151

Rollup of 9 pull requests #74151

Conversation

Manishearth commented Jul 8, 2020

Manishearth commented Jul 8, 2020

bors commented Jul 8, 2020

bors commented Jul 8, 2020

bors commented Jul 8, 2020

Manishearth commented Jul 8, 2020