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 9 pull requests #74151

Closed
wants to merge 25 commits into from

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 25 commits July 3, 2020 13:22
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 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.
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.
…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.
@Manishearth
Copy link
Member Author

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

@bors
Copy link
Contributor

bors commented Jul 8, 2020

📌 Commit ef081d1 has been approved by Manishearth

@rustbot rustbot added the rollup A PR which is a rollup label Jul 8, 2020
@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 8, 2020
@bors
Copy link
Contributor

bors commented Jul 8, 2020

⌛ Testing commit ef081d1 with merge 0ed18125187144a8c36c9dca6dcbb3bea8a6555c...

@bors
Copy link
Contributor

bors commented Jul 8, 2020

💔 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 8, 2020
@Manishearth
Copy link
Member Author

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

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.

10 participants