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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #64520

Closed
wants to merge 18 commits into from
Closed

Rollup of 6 pull requests #64520

wants to merge 18 commits into from

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 16, 2019

Successful merges:

Failed merges:

r? @ghost

mark-i-m and others added 18 commits September 12, 2019 16:43
@mark-i-m
Various refactorings to clean up nll diagnostics
68b1a87 
- Create ErrorReportingCtx and ErrorConstraintInfo, vasting reducing the
  number of arguments passed around everywhere in the error reporting code
- Create RegionErrorNamingCtx, making a given lifetime have consistent
  numbering thoughout all error messages for that MIR def.
- Make the error reporting code return the DiagnosticBuilder rather than
  directly buffer the Diagnostic. This makes it easier to modify the
  diagnostic later, e.g. to add suggestions.
@mark-i-m
minor fixes
23db450
@mark-i-m
update tests
5b09358
@mark-i-m
address Centril's comments
2a774b1
@varkor
Make some adjustments to the documentation for std::convert::identity
18b24b7 
Fixes some extra blank lines and makes some minor tweaks to the wording.
@Centril
AdtDef is an algebraic data type, not abstract data type.
2fd4e58
@estebank
On obligation errors point at the unfulfilled binding when possible
f6715d4
@estebank
Point at correct span for parenthesized types
4cc9397
@estebank
review comments
9d6555c
@estebank
ignore musl target in tests to avoid issues with output differences
eac2b02
@RalfJung
update Nomicon and Reference
8a8a57e
@spastorino
Use while let slice_pattern instead of carrying an index around
d1f763f
@Centril
Rollup merge of rust-lang#64151 - estebank:binding-error, r=varkor
1eed627 
On obligation errors point at the unfulfilled binding when possible

CC rust-lang#42855, rust-lang#64130, rust-lang#64135.
@Centril
Rollup merge of rust-lang#64357 - rust-lang:adt-docs-fix, r=varkor
881a0b7 
`AdtDef` is an algebraic data type, not abstract data type

r? @varkor
@Centril
Rollup merge of rust-lang#64416 - mark-i-m:region-naming-ctx, r=estebank
8515439 
Various refactorings to clean up nll diagnostics

- Create ErrorReportingCtx and ErrorConstraintInfo, vasting reducing the
  number of arguments passed around everywhere in the error reporting code
- Create RegionErrorNamingCtx, making a given lifetime have consistent
  numbering thoughout all error messages for that MIR def.
- Make the error reporting code return the DiagnosticBuilder rather than
  directly buffer the Diagnostic. This makes it easier to modify the
  diagnostic later, e.g. to add suggestions.

r? @estebank

Split out from rust-lang#58281
@Centril
Rollup merge of rust-lang#64509 - varkor:convert-identity-doc-fixes, …
4a65aa3 
…r=Centril

Make some adjustments to the documentation for `std::convert::identity`

Fixes some extra blank lines and makes some minor tweaks to the wording.
@Centril
Rollup merge of rust-lang#64516 - RalfJung:nomicon, r=Centril
4690b71 
update Nomicon and Reference

Cc @Centril
@Centril
Rollup merge of rust-lang#64518 - spastorino:while-let-to-iterate-ove…
6a312d7 
…r-proj-slice, r=oli-obk

Use while let slice_pattern instead of carrying an index around

r? @oli-obk
@Centril
Copy link
Contributor Author

Centril commented Sep 16, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Sep 16, 2019

📌 Commit 6a312d7 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 Sep 16, 2019
@Centril Centril closed this Sep 16, 2019
@Centril Centril deleted the rollup-a11d7cp branch September 16, 2019 19:40
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 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-09-16T19:39:52.3841807Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-16T19:39:52.4008987Z ##[command]git config gc.auto 0
2019-09-16T19:39:52.4079586Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-16T19:39:52.4127342Z ##[command]git config --get-all http.proxy
2019-09-16T19:39:52.4271041Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64520/merge:refs/remotes/pull/64520/merge
---
2019-09-16T20:39:11.5748503Z .................................................................................................... 1500/9022
2019-09-16T20:39:17.0795058Z .................................................................................................... 1600/9022
2019-09-16T20:39:28.6866034Z ...............................................................i...............i.................... 1700/9022
2019-09-16T20:39:35.2983966Z .................................................................................................... 1800/9022
2019-09-16T20:39:49.5671892Z ......................................................iiiii......................................... 1900/9022
2019-09-16T20:40:00.0902762Z .................................................................................................... 2100/9022
2019-09-16T20:40:02.3881012Z .................................................................................................... 2200/9022
2019-09-16T20:40:05.5008533Z .................................................................................................... 2300/9022
2019-09-16T20:40:13.1223104Z .................................................................................................... 2400/9022
---
2019-09-16T20:42:58.3517757Z ..........................................i...............i......................................... 4700/9022
2019-09-16T20:43:08.2511858Z .................................................................................................... 4800/9022
2019-09-16T20:43:14.6915774Z .................................................................................................... 4900/9022
2019-09-16T20:43:23.4425933Z .................................................................................................... 5000/9022
2019-09-16T20:43:30.5614699Z ..........................ii.ii..................................................................... 5100/9022
2019-09-16T20:43:40.0960862Z .................................................................................................... 5300/9022
2019-09-16T20:43:49.5599806Z ..........................................................................................i......... 5400/9022
2019-09-16T20:43:57.5130551Z .................................................................................................... 5500/9022
2019-09-16T20:44:02.1408033Z .................................................................................................... 5600/9022
2019-09-16T20:44:02.1408033Z .................................................................................................... 5600/9022
2019-09-16T20:44:12.0665156Z .....................................................................................ii...i..ii..... 5700/9022
2019-09-16T20:44:35.8847222Z .................................................................................................... 5900/9022
2019-09-16T20:44:45.3584182Z .................................................................................................... 6000/9022
2019-09-16T20:44:45.3584182Z .................................................................................................... 6000/9022
2019-09-16T20:44:50.2285039Z .......................................................................................i..ii........ 6100/9022
2019-09-16T20:45:17.4750805Z .................................................................................................... 6300/9022
2019-09-16T20:45:20.9903325Z ..............................................i..................................................... 6400/9022
2019-09-16T20:45:22.9703787Z .................................................................................................... 6500/9022
2019-09-16T20:45:25.3099159Z ..................i................................................................................. 6600/9022
---
2019-09-16T20:49:48.2873477Z  finished in 5.178
2019-09-16T20:49:48.3061272Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T20:49:48.4659946Z 
2019-09-16T20:49:48.4660965Z running 150 tests
2019-09-16T20:49:51.6278608Z i....iii......iii..iiii....i.............................i..i..................i....i.........ii.i.i 100/150
2019-09-16T20:49:53.6058789Z ..iiii..............i.........iii.i.......ii......
2019-09-16T20:49:53.6060395Z 
2019-09-16T20:49:53.6064798Z  finished in 5.300
2019-09-16T20:49:53.6277859Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T20:49:53.7947117Z 
---
2019-09-16T20:49:55.8702737Z  finished in 2.243
2019-09-16T20:49:55.8876670Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T20:49:56.6524282Z 
2019-09-16T20:49:56.6524436Z running 9 tests
2019-09-16T20:49:56.6525487Z iiiiiiiii
2019-09-16T20:49:56.6525793Z 
2019-09-16T20:49:56.6525831Z  finished in 0.146
2019-09-16T20:49:56.6526100Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T20:49:56.6526157Z 
---
2019-09-16T20:50:13.6542474Z  finished in 17.601
2019-09-16T20:50:13.6735277Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T20:50:13.8377470Z 
2019-09-16T20:50:13.8378599Z running 123 tests
2019-09-16T20:50:36.8063144Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-09-16T20:50:41.2774937Z i.i.i......iii.i.....ii
2019-09-16T20:50:41.2783234Z 
2019-09-16T20:50:41.2786877Z  finished in 27.605
2019-09-16T20:50:41.2798342Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T20:50:41.2800729Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-09-16T21:03:48.1686953Z 
2019-09-16T21:03:48.1687768Z    Doc-tests core
2019-09-16T21:03:53.1943165Z 
2019-09-16T21:03:53.1945411Z running 2400 tests
2019-09-16T21:04:04.3706819Z ......iiiii......................................................................................... 100/2400
2019-09-16T21:04:14.5550082Z ...........................................................................ii....................... 200/2400
2019-09-16T21:04:26.4383712Z .................................................................................................i.. 300/2400
2019-09-16T21:04:39.1339580Z .................................................................................................... 400/2400
2019-09-16T21:04:48.9849687Z ............................................i..i.................iiii............................... 500/2400
2019-09-16T21:05:08.4714247Z .................................................................................................... 700/2400
2019-09-16T21:05:18.2582693Z .................................................................................................... 800/2400
2019-09-16T21:05:28.0560750Z .................................................................................................... 900/2400
2019-09-16T21:05:38.3941456Z .................................................................................................... 1000/2400
---
2019-09-16T21:10:13.1748792Z .................................................................................................... 500/763
2019-09-16T21:10:13.1970433Z ....................thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-09-16T21:10:13.1993618Z ....thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-09-16T21:10:13.2003226Z thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: "SendError(..)"', src/libcore/result.rs:1165:5
2019-09-16T21:10:13.2034871Z .......thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-09-16T21:10:13.4022850Z ..........................................thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-09-16T21:10:13.4050233Z .....thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: "SendError(..)"', src/libcore/result.rs:1165:5
2019-09-16T21:10:13.4057493Z thread '<unnamed>.' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-09-16T21:10:13.4074247Z ......thread '<unnamed>' panicked at 'called `Result::unwrap()` on an `Err` value: RecvError', src/libcore/result.rs:1165:5
2019-09-16T21:10:15.4554195Z ......................thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/mutex.rs:629:13
2019-09-16T21:10:15.4561295Z .........thread '<unnamed>' panicked at 'test panic in inner thread to poison mutex', src/libstd/sync/mutex.rs:584:13
2019-09-16T21:10:15.4565124Z thread '<unnamed>' panicked at 'test panic in inner thread to poison mutex', src/libstd/sync/mutex.rs:561:13
2019-09-16T21:10:15.4581470Z thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/mutex.rs:689:13
---
2019-09-16T21:10:24.8428476Z 
2019-09-16T21:10:24.8428737Z running 991 tests
2019-09-16T21:10:45.5497165Z i................................................................................................... 100/991
2019-09-16T21:10:56.7630314Z .................................................................................................... 200/991
2019-09-16T21:11:04.6479843Z .................iii......i......i...i......i....................................................... 300/991
2019-09-16T21:11:10.1622272Z .................................................................................................... 400/991
2019-09-16T21:11:17.8832473Z ..................................i..i.................................ii........................... 500/991
2019-09-16T21:11:32.2990599Z .................................................................................................... 700/991
2019-09-16T21:11:32.2990599Z .................................................................................................... 700/991
2019-09-16T21:11:40.0691576Z .................iiii............................................................................... 800/991
2019-09-16T21:11:54.6606901Z .................................................................................................... 900/991
2019-09-16T21:12:01.9913493Z .......................................iiii................................................
2019-09-16T21:12:01.9914086Z 
2019-09-16T21:12:01.9963366Z  finished in 232.518
2019-09-16T21:12:01.9979213Z Testing term stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-16T21:12:02.1967289Z    Compiling term v0.0.0 (/checkout/src/libterm)
---
2019-09-16T21:26:44.2813278Z Rustbook (x86_64-unknown-linux-gnu) - edition-guide
2019-09-16T21:26:44.6149940Z Building stage0 tool linkchecker (x86_64-unknown-linux-gnu)
2019-09-16T21:26:44.7762482Z    Compiling linkchecker v0.1.0 (/checkout/src/tools/linkchecker)
2019-09-16T21:26:46.7323834Z     Finished release [optimized] target(s) in 2.11s
2019-09-16T21:26:53.9055071Z nomicon/print.html:3158: broken link - core/ptr/fn.copy.html
2019-09-16T21:26:53.9056656Z nomicon/print.html:3158: broken link - core/ptr/fn.copy_nonoverlapping.html
2019-09-16T21:26:53.9169878Z nomicon/unchecked-uninit.html:237: broken link - core/ptr/fn.copy.html
2019-09-16T21:26:53.9170888Z nomicon/unchecked-uninit.html:237: broken link - core/ptr/fn.copy_nonoverlapping.html
2019-09-16T21:26:53.9786285Z thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:39:9
2019-09-16T21:26:53.9834533Z 
2019-09-16T21:26:53.9834820Z 
2019-09-16T21:26:53.9836195Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/linkchecker" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc"
2019-09-16T21:26:53.9836568Z expected success, got: exit code: 101
---
2019-09-16T21:26:53.9894343Z == clock drift check ==
2019-09-16T21:26:53.9908592Z   local time: Mon Sep 16 21:26:53 UTC 2019
2019-09-16T21:26:54.1436245Z   network time: Mon, 16 Sep 2019 21:26:54 GMT
2019-09-16T21:26:54.1439598Z == end clock drift check ==
2019-09-16T21:26:56.8240506Z ##[error]Bash exited with code '1'.
2019-09-16T21:26:56.8276242Z ##[section]Starting: Checkout
2019-09-16T21:26:56.8278048Z ==============================================================================
2019-09-16T21:26:56.8278121Z Task         : Get sources
2019-09-16T21:26:56.8278169Z 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)

@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Centril @bors @rust-highfive @mark-i-m @varkor @estebank @RalfJung @spastorino