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 11 pull requests #66483

Closed
wants to merge 44 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Nov 17, 2019

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 30 commits September 25, 2019 13:03
Co-Authored-By: Oliver Middleton <olliemail27@gmail.com>
The example refers to a static lifetime parameter that can be elided.
This parameter is not included, meaning lifetime elision is not shown.
Revert weird renaming of the former `LitError::report`
The previous ordering of the sentences kept switching between the return
value and the value of `self` after execution, making it hard to follow.

Additionally, as rendered in the browser, the period in "`Self`. `self`"
was difficult to make out as being a sentence separator and not one code
block.
Remove the incorrect usage of "copy" as the trait is not called.
petrochenkov and others added 14 commits November 17, 2019 01:11
…eme, r=Dylan-DPC

Stabilize rustdoc theme options

Closes rust-lang#54730

This PR stabilizes the `--themes` (now `--theme`) and `--theme-checker` (now `--check-theme`) options, for allowing users to add custom themes to their documentation.

Rustdoc includes two themes by default: `light` and `dark`. Using the `--theme` option, you can give rustdoc a CSS file to include as an extra theme for that render. Themes are named after the CSS file used, so using `--theme /path/to/your/custom-theme.css` will add a theme called `custom-theme` to the documentation.

Even though the CLI flag to add a theme is getting stabilized, there's no guarantee that a theme file will always have the same effect on documentation generated with future versions of rustdoc. To aid in ensuring that a theme will work, the flag `--check-theme` is also available, which compares the CSS rules defined by a custom theme against the ones used in the `light` theme. If the `light` theme defines a CSS rule that the custom theme does not, rustdoc will report an error. (Rustdoc also performs this check for themes given to `--theme`, but only reports a warning when a difference is found.)
Improve documentation of `Vec::split_off(...)`

The previous ordering of the sentences kept switching between the return
value and the value of `self` after execution, making it hard to follow.

Additionally, as rendered in the browser, the period in "`Self`. `self`"
was difficult to make out as being a sentence separator and not one code
block.
syntax: Keep string literals in ABIs and `asm!` more precisely

As a result we don't lose spans when `extern` functions or blocks are passed to proc macros, and also escape all string literals consistently.
Continuation of rust-lang#60679, which did a similar thing with all literals besides those in ABIs and `asm!`.

TODO: Add tests.

Fixes rust-lang#60493
Fixes rust-lang#64561
r? @Centril
…sper

rustc_plugin: Remove `Registry::register_attribute`

Legacy plugins cannot register inert attributes anymore.

The preferred replacement is to use `register_tool` ([tracking issue](rust-lang#66079)).
```rust
#![register_tool(servo)]

#[servo::must_root]
struct S;
```

The more direct replacement is `register_attribute` ([tracking issue](rust-lang#66080))
```rust
#![register_attr(must_root)]

#[must_root]
struct S;
```
, but it requires registering each attribute individually rather than registering the tool once, and is more likely to be removed rather than stabilized.
find_deprecation: deprecation attr may be ill-formed meta.

Fixes rust-lang#66340.

r? @petrochenkov
cc @pnkfelix
…lan-DPC

Centralize panic macro documentation

This is just the main commit from rust-lang#61511 (which got closed because the author didn't reply) cherry-picked on the current master. Building `core` and `std` on this branch in stage 1 succeeded, which I thinks means the issues from the previous PR should be gone (but let's see what CI says).
…hown, r=rkruppe

add missing 'static lifetime in docs
miri panic_unwind: fix hack for SEH platforms

The old hack didn't work as we ended up duplicating the `eh_personality` lang item...

I have no idea if rustc cares that `eh_catch_typeinfo` has a certain shape, but better safe than sorry. I cannot test this locally.

r? @oli-obk Cc @Aaron1011
Use "field is never read" instead of "field is never used"

this is my first PR here so please let me know if i am doing it wrong
closes rust-lang#64465
i will be referencing this with a book PR that updates the same language
…=Centril

Clarify transmute_copy documentation example

Currently the documentation for `transmute_copy` implies that the function accepts a slice due to the variable name chosen in the example. This is misleading as `foo_slice` is actually an array and `transmute_copy` cannot take an unsized type anyway.

This PR just clarifies things by renaming the variable used in the example.
@Centril
Copy link
Contributor Author

Centril commented Nov 17, 2019

@bors r+ p=11 rollup=never

@bors
Copy link
Contributor

bors commented Nov 17, 2019

📌 Commit 9885dd3 has been approved by Centril

@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 Nov 17, 2019
@Centril Centril added the rollup A PR which is a rollup label Nov 17, 2019
@bors
Copy link
Contributor

bors commented Nov 17, 2019

⌛ Testing commit 9885dd3 with merge 5fc48bfcd68834554c6ed99e431e05ccc3351cdd...

@rust-highfive
Copy link
Collaborator

The job x86_64-msvc-1 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-11-17T02:08:26.5275509Z do so (now or later) by using -b with the checkout command again. Example:
2019-11-17T02:08:26.5275589Z 
2019-11-17T02:08:26.5275657Z   git checkout -b <new-branch-name>
2019-11-17T02:08:26.5275886Z 
2019-11-17T02:08:26.5275999Z HEAD is now at 5fc48bfcd Auto merge of #66483 - Centril:rollup-u5l8cpy, r=Centril
2019-11-17T02:08:26.5619600Z ##[section]Starting: Decide whether to run this job
2019-11-17T02:08:26.5720468Z ==============================================================================
2019-11-17T02:08:26.5720579Z Task         : Bash
2019-11-17T02:08:26.5720656Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-11-17T02:08:27.9471438Z 
2019-11-17T02:08:27.9471636Z 
2019-11-17T02:08:27.9471767Z 
2019-11-17T02:08:27.9471888Z 
2019-11-17T02:08:27.9472986Z  - #54733 (Stabilize rustdoc theme options)
2019-11-17T02:08:27.9473335Z  - #65739 (Improve documentation of `Vec::split_off(...)`)
2019-11-17T02:08:27.9475051Z  - #66271 (syntax: Keep string literals in ABIs and `asm!` more precisely)
2019-11-17T02:08:27.9475409Z  - #66344 (rustc_plugin: Remove `Registry::register_attribute`)
2019-11-17T02:08:27.9475604Z  - #66381 (find_deprecation: deprecation attr may be ill-formed meta.)
2019-11-17T02:08:27.9475800Z  - #66395 (Centralize panic macro documentation)
2019-11-17T02:08:27.9476000Z  - #66465 (add missing 'static lifetime in docs)
2019-11-17T02:08:27.9476177Z  - #66466 (miri panic_unwind: fix hack for SEH platforms)
2019-11-17T02:08:27.9476372Z  - #66469 (Use "field is never read" instead of "field is never used")
2019-11-17T02:08:27.9476735Z  - #66477 (Clarify transmute_copy documentation example)
2019-11-17T02:08:27.9476912Z AGENT_BUILDDIRECTORY=D:\a\1
2019-11-17T02:08:27.9477081Z AGENT_DISABLELOGPLUGIN_TESTFILEPUBLISHERPLUGIN=true
2019-11-17T02:08:27.9477266Z AGENT_DISABLELOGPLUGIN_TESTRESULTLOGPLUGIN=true
---
2019-11-17T02:08:27.9488030Z BUILD_SOURCEBRANCHNAME=auto
2019-11-17T02:08:27.9488112Z BUILD_SOURCESDIRECTORY=D:\a\1\s
2019-11-17T02:08:27.9488195Z BUILD_SOURCEVERSION=5fc48bfcd68834554c6ed99e431e05ccc3351cdd
2019-11-17T02:08:27.9488285Z BUILD_SOURCEVERSIONAUTHOR=bors
2019-11-17T02:08:27.9488381Z BUILD_SOURCEVERSIONMESSAGE=Auto merge of #66483 - Centril:rollup-u5l8cpy, r=Centril
2019-11-17T02:08:27.9488546Z COBERTURA_HOME=C:\cobertura-2.1.1
2019-11-17T02:08:27.9488637Z COMMONPROGRAMFILES=C:\Program Files\Common Files
2019-11-17T02:08:27.9488730Z COMMON_TESTRESULTSDIRECTORY=D:\a\1\TestResults
2019-11-17T02:08:27.9488800Z COMPUTERNAME=fv-az413
---
2019-11-17T04:25:21.9406431Z status: exit code: 2
2019-11-17T04:25:21.9406701Z command: "make"
2019-11-17T04:25:21.9406976Z stdout:
2019-11-17T04:25:21.9407247Z ------------------------------------------
2019-11-17T04:25:21.9407562Z make[1]: Entering directory '/d/a/1/s/src/test/run-make-fulldeps/rustdoc-themes'
2019-11-17T04:25:21.9408213Z cp D:\a\1\s/src/librustdoc/html/static/themes/light.css /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/rustdoc-themes/rustdoc-themes/test.css
2019-11-17T04:25:21.9410265Z PATH="/d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/rustdoc-themes/rustdoc-themes:D:\a\1\s\build\x86_64-pc-windows-msvc\stage2\bin:/c/Program Files (x86)/Windows Kits/10/bin/x64:/c/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x64:/c/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Tools/MSVC/14.16.27023/bin/HostX64/x64:/d/a/1/s/build/x86_64-pc-windows-msvc/stage0-bootstrap-tools/x86_64-pc-windows-msvc/release/deps:/d/a/1/s/build/x86_64-pc-windows-msvc/stage0/bin:/mingw64/bin:/d/a/1/s/ninja:/mingw64/bin:/c/Python27amd64:/usr/bin:/c/Program Files (x86)/Inno Setup 5:/d/a/1/s/sccache:/c/agents/2.160.1/externals/git/cmd:/c/hostedtoolcache/windows/Python/3.6.8/x64:/c/hostedtoolcache/windows/Python/3.6.8/x64/Scripts:/c/Program Files/Mercurial:/c/ProgramData/kind:/c/vcpkg:/c/cf-cli:/c/Program Files (x86)/NSIS:/c/Program Files/Mercurial:/c/Program Files/Boost/1.69.0:/c/Program Files/dotnet:/c/mysql-5.7.21-winx64/bin:/c/Program Files/Java/zulu-8-azure-jdk_8.40.0.25-8.0.222-win_x64/bin:/c/npm/prefix:/c/Rust/.cargo/bin:/c/hostedtoolcache/windows/Ruby/2.5.5/x64/bin:/c/Go1.12.7/bin:/c/Program Files/Git/bin:/c/Program Files/Git/usr/bin:/c/Program Files/Git/mingw64/bin:/c/hostedtoolcache/windows/Python/3.6.8/x64/Scripts:/c/hostedtoolcache/windows/Python/3.6.8/x64:/c/Program Files (x86)/Microsoft SDKs/Azure/CLI2/wbin:/c/Program Files/Microsoft MPI/Bin:/c/windows/system32:/c/windows:/c/windows/System32/Wbem:/c/windows/System32/WindowsPowerShell/v1.0:/c/ProgramData/Chocolatey/bin:/c/Program Files/Docker:/c/Program Files/PowerShell/6:/c/Program Files/dotnet:/c/Program Files/Microsoft SQL Server/130/Tools/Binn:/c/Program Files (x86)/Microsoft SQL Server/110/DTS/Binn:/c/Program Files (x86)/Microsoft SQL Server/120/DTS/Binn:/c/Program Files (x86)/Microsoft SQL Server/130/DTS/Binn:/c/Program Files (x86)/Microsoft SQL Server/140/DTS/Binn:/c/Program Files (x86)/Microsoft SQL Server/150/DTS/Binn:/c/Program Files (x86)/Windows Kits/10/Windows Performance Toolkit:/c/Program Files/Microsoft Service Fabric/bin/Fabric/Fabric.Code:/c/Program Files/Microsoft SDKs/Service Fabric/Tools/ServiceFabricLocalClusterManager:/c/Program Files/Git/cmd:/c/Program Files/Git/mingw64/bin:/c/Program Files/Git/usr/bin:/c/tools/php:/c/Program Files (x86)/Subversion/bin:/c/Program Files/nodejs:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.2/bin:/c/Program Files/CMake/bin:/c/Strawberry/c/bin:/c/Strawberry/perl/site/bin:/c/Strawberry/perl/bin:/c/Program Files/OpenSSL/bin:/c/Users/VssAdministrator/.dotnet/tools:/c/Program Files (x86)/Microsoft SQL Server/120" 'D:\a\1\s\build\x86_64-pc-windows-msvc\stage2\bin\rustdoc.exe' -L D:\a\1\s\build\x86_64-pc-windows-msvc\stage2\lib\rustlib\x86_64-pc-windows-msvc\lib -o "/d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/rustdoc-themes/rustdoc-themes/rustdoc-themes" foo.rs --theme /d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/rustdoc-themes/rustdoc-themes/test.css
2019-11-17T04:25:21.9412207Z D:\a\msys2\mingw64\bin\python2.7 D:\a\1\s/src/etc/htmldocck.py "/d/a/1/s/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/rustdoc-themes/rustdoc-themes/rustdoc-themes" foo.rs
2019-11-17T04:25:21.9412554Z make[1]: Leaving directory '/d/a/1/s/src/test/run-make-fulldeps/rustdoc-themes'
2019-11-17T04:25:21.9412926Z ------------------------------------------
2019-11-17T04:25:21.9413107Z stderr:
2019-11-17T04:25:21.9413554Z ------------------------------------------
2019-11-17T04:25:21.9413554Z ------------------------------------------
2019-11-17T04:25:21.9417694Z /bin/sh: D:amsys2mingw64binpython2.7: command not found
2019-11-17T04:25:21.9418032Z make[1]: *** [Makefile:10: all] Error 127
2019-11-17T04:25:21.9418606Z ------------------------------------------
2019-11-17T04:25:21.9418798Z 
2019-11-17T04:25:21.9418993Z 
2019-11-17T04:25:21.9419115Z 
---
2019-11-17T04:25:21.9420493Z thread 'main' panicked at 'Some tests failed', src\tools\compiletest\src\main.rs:537:22
2019-11-17T04:25:21.9420630Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-11-17T04:25:21.9420696Z 
2019-11-17T04:25:21.9420733Z 
2019-11-17T04:25:21.9423042Z command did not execute successfully: "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage0-tools-bin\\compiletest.exe" "--compile-lib-path" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage2\\bin" "--run-lib-path" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "--rustc-path" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage2\\bin\\rustc.exe" "--rustdoc-path" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\stage2\\bin\\rustdoc.exe" "--src-base" "D:\\a\\1\\s\\src/test\\run-make-fulldeps" "--build-base" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\test\\run-make-fulldeps" "--stage-id" "stage2-x86_64-pc-windows-msvc" "--mode" "run-make" "--target" "x86_64-pc-windows-msvc" "--host" "x86_64-pc-windows-msvc" "--llvm-filecheck" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\llvm\\build\\bin\\FileCheck.exe" "--nodejs" "C:\\Program Files\\nodejs\\node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\native\\rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\native\\rust-test-helpers" "--docck-python" "D:\\a\\msys2\\mingw64\\bin\\python2.7" "--lldb-python" "D:\\a\\msys2\\mingw64\\bin\\python2.7" "--gdb" "D:\\a\\msys2\\mingw64\\bin\\gdb" "--llvm-version" "9.0.0-rust-1.41.0-dev\n" "--cc" "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\bin\\HostX64\\x64\\cl.exe" "--cxx" "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\bin\\HostX64\\x64\\cl.exe" "--cflags" "-nologo -MT -Brepro" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter binaryformat bitreader bitstreamreader bitwriter codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver engine executionengine fuzzmutate globalisel gtest gtest_main hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation 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 passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvutils runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target testingsupport textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86utils xray" "--llvm-cxxflags" "-ID:\\a\\1\\s\\src\\llvm-project\\llvm\\include -ID:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\llvm\\build\\include    /EHs-c- /GR- -D_DEBUG_POINTER_IMPL= -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -DUNICODE -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" "--llvm-bin-dir" "D:\\a\\1\\s\\build\\x86_64-pc-windows-msvc\\llvm\\build\\bin" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-11-17T04:25:21.9425134Z 
2019-11-17T04:25:21.9425176Z 
2019-11-17T04:25:21.9425176Z 
2019-11-17T04:25:22.0442256Z failed to run: D:\a\1\s\build\bootstrap\debug\bootstrap test --exclude src/test/ui --exclude src/test/compile-fail --exclude src/tools/linkchecker
2019-11-17T04:25:22.0442452Z Build completed unsuccessfully in 2:06:01
2019-11-17T04:25:22.0905545Z make: *** [Makefile:80: ci-subset-1] Error 1
2019-11-17T04:25:22.1488061Z   local time: Sun Nov 17 04:25:22 CUT 2019
2019-11-17T04:25:22.4071219Z   network time: Sun, 17 Nov 2019 04:25:22 GMT
2019-11-17T04:25:22.4101356Z == end clock drift check ==
2019-11-17T04:25:22.5198803Z 
2019-11-17T04:25:22.5198803Z 
2019-11-17T04:25:22.7757582Z ##[error]Bash exited with code '2'.
2019-11-17T04:25:22.8550706Z ##[section]Starting: Checkout
2019-11-17T04:25:22.9653050Z ==============================================================================
2019-11-17T04:25:22.9653184Z Task         : Get sources
2019-11-17T04:25:22.9653274Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Nov 17, 2019

💔 Test failed - checks-azure

@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 Nov 17, 2019
@Centril Centril closed this Nov 17, 2019
@Centril Centril deleted the rollup-u5l8cpy branch November 17, 2019 04:44
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.