Rollup of 8 pull requests by JohnTitor · Pull Request #69730 · rust-lang/rust

JohnTitor · 2020-03-05T10:45:27Z

Successful merges:

Make error message clearer about creating new module #69520 (Make error message clearer about creating new module)
delay_span_bug when codegen cannot select obligation #69614 (delay_span_bug when codegen cannot select obligation)
Update books #69641 (Update books)
Add explanation for E0380 #69697 (Add explanation for E0380)
Use associated constants of integer types #69698 (Use associated constants of integer types)
Toolstate: remove redundant beta-week check. #69705 (Toolstate: remove redundant beta-week check.)
Update macros.rs: fix documentation typo. #69711 (Update macros.rs: fix documentation typo.)
more clippy cleanups #69713 (more clippy cleanups)

Failed merges:

Fixrust-lang#69602, introduced in rust-lang#60126 by letting the compiler continue past type checking after encountering errors.

The Result can be expect-unwrapped directly. (clippy::ok_expect)

…x| Some(y)) (clippy::option_and_then_some)

…n_as_ref_deref)

…nd anything. For example: `if let Some(_) = foo() {}` can be reduced to `if foo().is_some() {}` (clippy::redundant_pattern_matching)

… type. These were introduced since I last fixed most of these occurences. (clippy::clone_on_copy, clippy::single_char_pattern)

Make error message clearer about creating new module This is a partial improvement for rust-lang#69492

`delay_span_bug` when codegen cannot select obligation Fixrust-lang#69602, introduced in rust-lang#60126 by letting the compiler continue past type checking after encountering errors.

Update books ## nomicon 8 commits in 3e6e1001dc6e095dbd5c88005e80969f60e384e1..9f797e65e6bcc79419975b17aff8e21c9adc039f 2019-12-14 22:08:52 +0000 to 2020-03-04 03:45:13 +0100 - Rustup to latest rustc (rust-lang/nomicon#203) - (minor) Add backticks around type names (rust-lang/nomicon#197) - Add book.toml (rust-lang/nomicon#185) - Rename `Alloc` to `AllocRef` (rust-lang/nomicon#188) - Lifetimes: explain how to fix destructor example (rust-lang/nomicon#195) - mention soundness (rust-lang/nomicon#194) - Fix example in FFI section Calling Rust from C (rust-lang/nomicon#193) - Removed repeated word (rust-lang/nomicon#191) ## reference 8 commits in 64239df..559e09c 2020-02-10 19:05:13 +0100 to 2020-03-02 01:17:14 +0100 - Syntax error fix (rust-lang/reference#769) - Fix incorrect pseudocode for #[repr(C)] struct alignment (rust-lang/reference#766) - Replace "Field-Less" with "Fieldless" (rust-lang/reference#768) - Removed repeated word (rust-lang/reference#767) - Update for change in const lint name. (rust-lang/reference#764) - semantic type -> resolved type (rust-lang/reference#761) - add behavior change of relative paths without `self` in 2018 edition (rust-lang/reference#757) - assignment operator expressions -> compound assignment expressions (rust-lang/reference#759) ## rust-by-example 3 commits in 32facd5522ddbbf37baf01e4e4b6562bc55c071a..db57f899ea2a56a544c8d280cbf033438666273d 2020-02-11 09:25:06 -0300 to 2020-02-18 17:46:46 -0300 - Minor typo fix in src/mod/visibility (rust-lang/rust-by-example#1309) - Don't suggest Into implements a reverse conversion (rust-lang/rust-by-example#1307) - Improve grammar in example of 'in let' section (rust-lang/rust-by-example#1308) ## embedded-book 2 commits in b2e1092bf67bd4d7686c4553f186edbb7f5f92db..b81ffb7a6f4c5aaed92786e770e99db116aa4ebd 2020-01-30 08:45:46 +0000 to 2020-02-27 08:06:04 +0000 - Setting output to `high` needs a `true` argument (rust-embedded/book#227) - Add licence notes to index.md (rust-embedded/book#226)

@Dylan-DPC

…=Dylan-DPC Add explanation for E0380 r? @Dylan-DPC

Use associated constants of integer types Take advantage of rust-lang#68952 in the interpreter and some nearby modules :)

…ta, r=Mark-Simulacrum Toolstate: remove redundant beta-week check. I made a bit of a mistake in rust-lang#69624. The "beta regression" doesn't need to be checked twice. I also rolled up rust-lang#69693 to avoid merge conflicts.

Update macros.rs: fix documentation typo.

more clippy cleanups * Don't use .ok() before unwrapping via .expect() on a Result. * Use .map() to modify data inside Options instead of using .and_then(|x| Some(y)) * Use .as_deref() instead of .as_ref().map(Deref::deref) * Don't use "if let" bindings to only check a value and not actually bind anything. * Use single-char patter on {ends,starts}_with and remove clone on copy type.

JohnTitor · 2020-03-05T10:45:55Z

@bors r+ p=8 rollup=never

bors · 2020-03-05T10:45:56Z

📌 Commit 3219fdd has been approved by JohnTitor

bors · 2020-03-05T10:46:51Z

⌛ Testing commit 3219fdd with merge 74906d37978f0e55926b59752b330d170e1a1325...

rust-highfive · 2020-03-05T10:50:34Z

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.

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 @rust-lang/infra. (Feature Requests)

bors · 2020-03-05T10:50:47Z

💔 Test failed - checks-azure

JohnTitor · 2020-03-05T10:55:19Z

Uhmmm, seems spurious.
@bors retry

bors · 2020-03-05T10:56:25Z

⌛ Testing commit 3219fdd with merge f4c4f0b1b971e02307dcc55689dbb3c80aec7338...

rust-highfive · 2020-03-05T13:40:34Z

The job i686-msvc-2 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.

2020-03-05T13:38:59.2197677Z 2020-03-05T13:38:59.2198220Z failures:
2020-03-05T13:38:59.2198594Z 2020-03-05T13:38:59.2199115Z ---- [ui] ui\parser\mod_file_not_exist_windows.rs stdout ----
2020-03-05T13:38:59.2201818Z $DIR\mod_file_not_exist_windows.rs
2020-03-05T13:38:59.2202544Z $DIR\not_a_real_file.rs
2020-03-05T13:38:59.2203391Z 2020-03-05T13:38:59.2204956Z error: D:/a/1/s/src/test/ui/parser/mod_file_not_exist_windows.rs:3: unexpected help message: '3:5: 3:20: to create the module `not_a_real_file`, create file "D:\a\1\s\src/test\ui\parser\not_a_real_file.rs"'
2020-03-05T13:38:59.2205885Z 2020-03-05T13:38:59.2207360Z error: D:/a/1/s/src/test/ui/parser/mod_file_not_exist_windows.rs:3: expected help message not found: name the file either not_a_real_file.rs or not_a_real_file\mod.rs inside the directory
2020-03-05T13:38:59.2209771Z error: 1 unexpected errors found, 1 expected errors not found
2020-03-05T13:38:59.2210304Z status: exit code: 1
2020-03-05T13:38:59.2210304Z status: exit code: 1
2020-03-05T13:38:59.2224153Z command: PATH="D:\a\1\s\build\i686-pc-windows-msvc\stage2\bin;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;D:\a\1\s\build\i686-pc-windows-msvc\stage0-bootstrap-tools\i686-pc-windows-msvc\release\deps;D:\a\1\s\build\i686-pc-windows-msvc\stage0\bin;D:\a\1\s\msys2\mingw32\bin;D:\a\1\s\ninja;D:\a\1\s\msys2\mingw32\bin;C:\Python27amd64;D:\a\1\s\msys2\usr\bin;C:\Program Files (x86)\Inno Setup 5;D:\a\1\s\sccache;C:\agents\2.165.0\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:\hostedtoolcache\windows\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:\SeleniumWebDrivers\GeckoDriver;C:\Program Files (x86)\sbt\bin;C:\Rust\.cargo\bin;C:\hostedtoolcache\windows\Ruby\2.5.7\x64\bin;C:\Go1.12.7\bin;C:\Program Files\Git\bin;C:\hostedtoolcache\windows\Python\3.6.8\x64\Scripts;C:\hostedtoolcache\windows\Python\3.6.8\x64;C:\npm\prefix;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\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\Subversion\bin;C:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.6.3\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 SQ" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "D:\\a\\1\\s\\src/test\\ui\\parser\\mod_file_not_exist_windows.rs" "-Zthreads=1" "--target=i686-pc-windows-msvc" "--error-format" "json" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\parser\\mod_file_not_exist_windows" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "-A" "unused" "-L" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui\\parser\\mod_file_not_exist_windows\\auxiliary"
2020-03-05T13:38:59.2233055Z Error {
2020-03-05T13:38:59.2233238Z line_num: 3,
2020-03-05T13:38:59.2233467Z kind: Some(
2020-03-05T13:38:59.2233674Z Help,
2020-03-05T13:38:59.2233674Z Help,
2020-03-05T13:38:59.2233839Z ),
2020-03-05T13:38:59.2234274Z msg: "3:5: 3:20: to create the module `not_a_real_file`, create file \"D:\\a\\1\\s\\src/test\\ui\\parser\\not_a_real_file.rs\"",
2020-03-05T13:38:59.2235182Z ]
2020-03-05T13:38:59.2235443Z 2020-03-05T13:38:59.2235989Z not found errors (from test file): [
2020-03-05T13:38:59.2236196Z Error {
2020-03-05T13:38:59.2236196Z Error {
2020-03-05T13:38:59.2236393Z line_num: 3,
2020-03-05T13:38:59.2236586Z kind: Some(
2020-03-05T13:38:59.2236791Z Help,
2020-03-05T13:38:59.2236951Z ),
2020-03-05T13:38:59.2237283Z msg: "name the file either not_a_real_file.rs or not_a_real_file\\mod.rs inside the directory",
2020-03-05T13:38:59.2237730Z ]
2020-03-05T13:38:59.2237827Z 2020-03-05T13:38:59.2238364Z thread '[ui] ui\parser\mod_file_not_exist_windows.rs' panicked at 'explicit panic', src\tools\compiletest\src\runtest.rs:1436:13
2020-03-05T13:38:59.2238896Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
---
2020-03-05T13:38:59.2241206Z 2020-03-05T13:38:59.2241938Z thread 'main' panicked at 'Some tests failed', src\tools\compiletest\src\main.rs:348:22
2020-03-05T13:38:59.2279094Z 2020-03-05T13:38:59.2279292Z 2020-03-05T13:38:59.2283506Z command did not execute successfully: "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage0-tools-bin\\compiletest.exe" "--compile-lib-path" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage2\\bin" "--run-lib-path" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage2\\lib\\rustlib\\i686-pc-windows-msvc\\lib" "--rustc-path" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\stage2\\bin\\rustc.exe" "--src-base" "D:\\a\\1\\s\\src/test\\ui" "--build-base" "D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\test\\ui" "--stage-id" "stage2-i686-pc-windows-msvc" "--mode" "ui" "--target" "i686-pc-windows-msvc" "--host" "i686-pc-windows-msvc" "--llvm-filecheck" "D:\\a\\1\\s\\build\\i686-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\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options -Lnative=D:\\a\\1\\s\\build\\i686-pc-windows-msvc\\native\\rust-test-helpers" "--docck-python" "D:\\a\\1\\s\\msys2\\mingw32\\bin\\python2.7" "--lldb-python" "D:\\a\\1\\s\\msys2\\mingw32\\bin\\python2.7" "--gdb" "D:\\a\\1\\s\\msys2\\mingw32\\bin\\gdb" "--llvm-version" "9.0.1-rust-1.43.0-nightly\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-03-05T13:38:59.2288207Z 2020-03-05T13:38:59.2288325Z 2020-03-05T13:38:59.3009629Z failed to run: D:\a\1\s\build\bootstrap\debug\bootstrap test src/test/ui src/test/compile-fail src/tools/linkchecker
2020-03-05T13:38:59.3010181Z Build completed unsuccessfully in 1:52:22
2020-03-05T13:38:59.3010181Z Build completed unsuccessfully in 1:52:22
2020-03-05T13:38:59.3560382Z make: *** [Makefile:82: ci-subset-2] Error 1
2020-03-05T13:38:59.4199436Z local time: Thu Mar 5 13:38:59 CUT 2020
2020-03-05T13:38:59.8796848Z network time: Thu, 05 Mar 2020 13:38:59 GMT
2020-03-05T13:38:59.8848537Z == end clock drift check ==
2020-03-05T13:38:59.9818570Z 2020-03-05T13:38:59.9818570Z 2020-03-05T13:39:00.2625657Z ##[error]Bash exited with code '2'.
2020-03-05T13:39:00.3304042Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-03-05T13:39:00.4407038Z ==============================================================================
2020-03-05T13:39:00.4407484Z Task : Get sources
2020-03-05T13:39:00.4407873Z 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 @rust-lang/infra. (Feature Requests)

bors · 2020-03-05T13:40:52Z

💔 Test failed - checks-azure

kornelskiand others added 24 commits March 1, 2020 13:46

Make error message clearer about creating new module
515446c
rust-lang#69492

Apply rustfmt :(
96b3261

delay_span_bug when codegen cannot select obligation
7b6f5ed
Fixrust-lang#69602, introduced in rust-lang#60126 by letting the compiler continue past type checking after encountering errors.

Add explanation for E0380
c745b4a

use integer assoc consts instead of methods
6db7e34

cover some more nearby cases
f0c3cf2

Update books
8ea676e

Toolstate: remove redundant beta-week check.
0e1cd59

more toolstate comments
a6d8c9c

Further clarifications and comments on toolstate operation.
a41f1f1

Update macros.rs: fix documentation typo.
729d49d

Don't use .ok() before unwrapping via .expect() on a Result.
07168f9
The Result can be expect-unwrapped directly. (clippy::ok_expect)

Use .map() to modify data inside Options instead of using .and_then(|…
569676b
…x| Some(y)) (clippy::option_and_then_some)

Use .as_deref() instead of .as_ref().map(Deref::deref) (clippy::optio…
38f5db7
…n_as_ref_deref)

Don't use "if let" bindings to only check a value and not actually bi…
d8d2004
…nd anything. For example: `if let Some(_) = foo() {}` can be reduced to `if foo().is_some() {}` (clippy::redundant_pattern_matching)

Use single-char patter on {ends,starts}_with and remove clone on copy…
80ed505
… type. These were introduced since I last fixed most of these occurences. (clippy::clone_on_copy, clippy::single_char_pattern)

Rollup merge ofrust-lang#69520- kornelski:e69492, r=cramertj
bb126e1
Make error message clearer about creating new module This is a partial improvement for rust-lang#69492

Rollup merge ofrust-lang#69614- estebank:ice-age, r=davidtwco
273c5b2
`delay_span_bug` when codegen cannot select obligation Fixrust-lang#69602, introduced in rust-lang#60126 by letting the compiler continue past type checking after encountering errors.

Rollup merge ofrust-lang#69697- GuillaumeGomez:explanation-e0380, r…
8a4419a
…=Dylan-DPC Add explanation for E0380 r? @Dylan-DPC

Rollup merge ofrust-lang#69698- RalfJung:int_assoc, r=davidtwco
6000a57
Use associated constants of integer types Take advantage of rust-lang#68952 in the interpreter and some nearby modules :)

Rollup merge ofrust-lang#69711- penelopezone:patch-1, r=steveklabnik
61b68f1
Update macros.rs: fix documentation typo.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 5, 2020

JohnTitor added the rollup A PR which is a rollup label Mar 5, 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 Mar 5, 2020

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 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 Mar 5, 2020

JohnTitor mentioned this pull request Mar 5, 2020
Make error message clearer about creating new module #69520
Merged

JohnTitor closed this Mar 5, 2020

JohnTitor deleted the rollup-6lrxgha branch March 5, 2020 13:50

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #69730

Rollup of 8 pull requests#69730
JohnTitor wants to merge 24 commits into
rust-lang:masterfrom
JohnTitor:rollup-6lrxgha

JohnTitor commented Mar 5, 2020

Uh oh!

JohnTitor commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

rust-highfive commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

JohnTitor commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

rust-highfive commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Uh oh!

Conversation

JohnTitor commented Mar 5, 2020

Uh oh!

JohnTitor commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

rust-highfive commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

JohnTitor commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

rust-highfive commented Mar 5, 2020

Uh oh!

bors commented Mar 5, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants