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

[beta] Rollup backports #56174

Merged
merged 21 commits into from
Nov 23, 2018
Merged

[beta] Rollup backports #56174

merged 21 commits into from
Nov 23, 2018

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented Nov 22, 2018

r? @ghost

@pietroalbini
Copy link
Member Author

Blocked on #56143 merging.

@pietroalbini pietroalbini added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Nov 22, 2018
@pietroalbini
Copy link
Member Author

cc @alexcrichton @Mark-Simulacrum

@alexcrichton
Copy link
Member

@bors: p=1000

r=me when good to go

@pietroalbini
Copy link
Member Author

@bors r=alexcrichton p=1000

@bors
Copy link
Contributor

bors commented Nov 22, 2018

📌 Commit 647cb20 has been approved by alexcrichton

@bors 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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Nov 22, 2018
@bors
Copy link
Contributor

bors commented Nov 22, 2018

⌛ Testing commit 647cb20 with merge 55f75206caeaba5156c7c70cd17846b51c7bc3fd...

@bors
Copy link
Contributor

bors commented Nov 23, 2018

💔 Test failed - status-appveyor

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 23, 2018
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 23, 2018
@kennytm
Copy link
Member

kennytm commented Nov 23, 2018

Needs to fix the nomicon.

[00:52:41] ---- C:\projects\rust\src/doc/nomicon\src\vec-final.md - The_Final_Code (line 3) stdout ----
[00:52:41] error[E0635]: unknown feature `alloc_layout_extra`
[00:52:41]  --> C:\projects\rust\src/doc/nomicon\src\vec-final.md:6:12
[00:52:41]   |
[00:52:41] 4 | #![feature(alloc_layout_extra)]
[00:52:41]   |            ^^^^^^^^^^^^^^^^^^
[00:52:41] 
[00:52:41] thread 'C:\projects\rust\src/doc/nomicon\src\vec-final.md - The_Final_Code (line 3)' panicked at 'couldn't compile the test', librustdoc\test.rs:332:13
[00:52:41] note: Run with `RUST_BACKTRACE=1` for a backtrace.

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 23, 2018
alexcrichton and others added 3 commits November 22, 2018 21:29
@alexcrichton
Copy link
Member

Breakage should be fixed in fffcde6, added in #56156 as well, updated OP

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 23, 2018

📌 Commit 659fcb9 has been approved by alexcrichton

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 23, 2018
@bors
Copy link
Contributor

bors commented Nov 23, 2018

⌛ Testing commit 659fcb9 with merge 7dfae34b7bbfaab942ee114c7abe4be3dedecf99...

@bors
Copy link
Contributor

bors commented Nov 23, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job dist-i686-freebsd of your PR failed on Travis (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.
[01:11:05] travis_fold:start:stage2-cargo
travis_time:start:stage2-cargo
Building stage2 tool cargo (i686-unknown-freebsd)
[01:11:06]  Downloading openssl-src v111.0.1+1.1.1
[01:11:26] warning: spurious network error (2 tries remaining): failed to download from `https://crates.io/api/v1/crates/openssl-src/111.0.1+1.1.1/download`
[01:11:46] warning: spurious network error (1 tries remaining): failed to download from `https://crates.io/api/v1/crates/openssl-src/111.0.1+1.1.1/download`
[01:12:06] 
[01:12:06] Caused by:
[01:12:06] Caused by:
[01:12:06]   failed to download from `https://crates.io/api/v1/crates/openssl-src/111.0.1+1.1.1/download`
[01:12:06] Caused by:
[01:12:06]   [6] Couldn't resolve host name (Could not resolve host: crates.io)
[01:12:06] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "i686-unknown-freebsd" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/cargo/Cargo.toml" "--features" "rustc-workspace-hack/all-static" "--message-format" "json"
[01:12:06] expected success, got: exit code: 101
---
travis_time:end:1c4fb64c:start=1542955786734286083,finish=1542955786742264422,duration=7978339
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0028a39c
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1701e8fe
travis_time:start:1701e8fe
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:01f17867
$ dmesg | grep -i kill

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 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 23, 2018
@kennytm
Copy link
Member

kennytm commented Nov 23, 2018

@bors retry travis-ci/travis-ci#9696

@bors 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 Nov 23, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed on Travis (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.
travis_time:end:01f22068:start=1542951164650899776,finish=1542951220996369949,duration=56345470173
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-tools
---
[01:48:48] test test::test_goto_def ... FAILED
[01:49:48] test test::test_infer_bin ... test test::test_infer_bin has been running for over 60 seconds
[01:50:08] test test::test_highlight ... FAILED
[01:51:08] test test::test_infer_custom_bin ... test test::test_infer_custom_bin has been running for over 60 seconds
[01:52:50] ERROR 2018-11-23T07:26:41Z: rls::actions: failed to fetch project model, using fallback: failed to load source for a dependency on `fnv`
[01:53:50] test test::test_infer_lib ... test test::test_infer_lib has been running for over 60 seconds
[01:53:50] test test::test_infer_lib ... test test::test_infer_lib has been running for over 60 seconds
[01:55:32] ERROR 2018-11-23T07:29:22Z: rls::actions: failed to fetch project model, using fallback: failed to load source for a dependency on `fnv`
[01:56:32] test test::test_multiple_binaries ... test test::test_multiple_binaries has been running for over 60 seconds
[01:56:52] test test::test_infer_bin ... FAILED
[01:57:52] test test::test_no_default_features ... test test::test_no_default_features has been running for over 60 seconds
[01:58:13] test test::test_infer_custom_bin ... FAILED
---
[02:10:20] test test::test_workspace_symbol_duplicates ... FAILED
[02:10:20] 
[02:10:20] failures:
[02:10:20] 
[02:10:20] ---- test::lens::test_lens_run stdout ----
[02:10:20] thread 'test::lens::test_lens_run' panicked at 'called `Option::unwrap()` on a `None` value', libcore/option.rs:355:21
[02:10:20] 
[02:10:20] ---- test::test_bin_lib_project stdout ----
[02:10:20] ---- test::test_bin_lib_project stdout ----
[02:10:20] thread 'test::test_bin_lib_project' panicked at 'Assert failed: Could not find `bin_lib/tests/tests.rs` in `{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"failed to load source for a dependency on `fnv`\nUnable to update registry `https://github.com/rust-lang/crates.io-index`\nfailed to fetch `https://github.com/rust-lang/crates.io-index`\ncurl error: Could not resolve host: github.com\n; class=Net (12)","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///checkout/obj/build/rls-test-data/test_data/bin_lib/Cargo.toml"}}`', tools/rls/src/test/harness.rs:227:9
[02:10:20] ---- test::test_all_targets stdout ----
[02:10:20] ---- test::test_all_targets stdout ----
[02:10:20] thread 'test::test_all_targets' panicked at 'Assert failed: Could not find `bin_lib/tests/tests.rs` in `{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"failed to load source for a dependency on `fnv`\nUnable to update registry `https://github.com/rust-lang/crates.io-index`\nfailed to fetch `https://github.com/rust-lang/crates.io-index`\ncurl error: Could not resolve host: github.com\n; class=Net (12)","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///checkout/obj/build/rls-test-data/test_data/bin_lib/Cargo.toml"}}`', tools/rls/src/test/harness.rs:227:9
[02:10:20] ---- test::test_borrow_error stdout ----
[02:10:20] ---- test::test_borrow_error stdout ----
[02:10:20] thread 'test::test_borrow_error' panicked at 'Assert failed: Could not find `"message":"cannot borrow `x` as mutable more than once at a time` in `{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"failed to load source for a dependency on `fnv`\nUnable to update registry `https://github.com/rust-lang/crates.io-index`\nfailed to fetch `https://github.com/rust-lang/crates.io-index`\ncurl error: Could not resolve host: github.com\n; class=Net (12)","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///checkout/obj/build/rls-test-data/test_data/borrow_error/Cargo.toml"}}`', tools/rls/src/test/harness.rs:227:9
[02:10:20] ---- test::test_deglob stdout ----
[02:10:20] thread 'test::test_deglob' panicked at 'assertion failed: `(left == right)`
[02:10:20]   left: `Null`,
[02:10:20]  right: `100`', tools/rls/src/test/mod.rs:1472:9
[02:10:20]  right: `100`', tools/rls/src/test/mod.rs:1472:9
[02:10:20] 
[02:10:20] ---- test::test_features stdout ----
[02:10:20] thread 'test::test_features' panicked at 'Assert failed: Could not find `"message":"cannot find struct, variant or union type `Bar` in this scope` in `{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"failed to load source for a dependency on `fnv`\nUnable to update registry `https://github.com/rust-lang/crates.io-index`\nfailed to fetch `https://github.com/rust-lang/crates.io-index`\ncurl error: Could not resolve host: github.com\n; class=Net (12)","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///checkout/obj/build/rls-test-data/test_data/features/Cargo.toml"}}`', tools/rls/src/test/harness.rs:227:9
[02:10:20] ---- test::test_find_all_refs_no_cfg_test stdout ----
[02:10:20] ---- test::test_find_all_refs_no_cfg_test stdout ----
[02:10:20] thread 'test::test_find_all_refs_no_cfg_test' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_find_all_refs stdout ----
[02:10:20] ---- test::test_find_all_refs stdout ----
[02:10:20] thread 'test::test_find_all_refs' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_find_impls stdout ----
[02:10:20] ---- test::test_find_impls stdout ----
[02:10:20] thread 'test::test_find_impls' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_goto_def stdout ----
[02:10:20] ---- test::test_goto_def stdout ----
[02:10:20] thread 'test::test_goto_def' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_highlight stdout ----
[02:10:20] ---- test::test_highlight stdout ----
[02:10:20] thread 'test::test_highlight' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_hover stdout ----
[02:10:20] ---- test::test_hover stdout ----
[02:10:20] thread 'test::test_hover' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_hover_after_src_line_change stdout ----
[02:10:20] ---- test::test_hover_after_src_line_change stdout ----
[02:10:20] thread 'test::test_hover_after_src_line_change' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_infer_bin stdout ----
[02:10:20] ---- test::test_infer_bin stdout ----
[02:10:20] thread 'test::test_infer_bin' panicked at 'Assert failed: Could not find `struct is never constructed: `UnusedBin`` in `{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"failed to load source for a dependency on `fnv`\nUnable to update registry `https://github.com/rust-lang/crates.io-index`\nfailed to fetch `https://github.com/rust-lang/crates.io-index`\ncurl error: Could not resolve host: github.com\n; class=Net (12)","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///checkout/obj/build/rls-test-data/test_data/infer_bin/Cargo.toml"}}`', tools/rls/src/test/harness.rs:227:9
[02:10:20] ---- test::test_infer_custom_bin stdout ----
[02:10:20] ---- test::test_infer_custom_bin stdout ----
[02:10:20] thread 'test::test_infer_custom_bin' panicked at 'Assert failed: Could not find `struct is never constructed: `UnusedCustomBin`` in `{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"failed to load source for a dependency on `fnv`\nUnable to update registry `https://github.com/rust-lang/crates.io-index`\nfailed to fetch `https://github.com/rust-lang/crates.io-index`\ncurl error: Could not resolve host: github.com\n; class=Net (12)","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///checkout/obj/build/rls-test-data/test_data/infer_custom_bin/Cargo.toml"}}`', tools/rls/src/test/harness.rs:227:9
[02:10:20] ---- test::test_infer_lib stdout ----
[02:10:20] ---- test::test_infer_lib stdout ----
[02:10:20] thread 'test::test_infer_lib' panicked at 'Assert failed: Could not find `struct is never constructed: `UnusedLib`` in `{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"failed to load source for a dependency on `fnv`\nUnable to update registry `https://github.com/rust-lang/crates.io-index`\nfailed to fetch `https://github.com/rust-lang/crates.io-index`\ncurl error: Could not resolve host: github.com\n; class=Net (12)","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///checkout/obj/build/rls-test-data/test_data/infer_lib/Cargo.toml"}}`', tools/rls/src/test/harness.rs:227:9
[02:10:20] ---- test::test_multiple_binaries stdout ----
[02:10:20] ---- test::test_multiple_binaries stdout ----
[02:10:20] thread 'test::test_multiple_binaries' panicked at 'Assert failed: Could not find `unused variable: `bin_name` in `{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"failed to load source for a dependency on `fnv`\nUnable to update registry `https://github.com/rust-lang/crates.io-index`\nfailed to fetch `https://github.com/rust-lang/crates.io-index`\ncurl error: Could not resolve host: github.com\n; class=Net (12)","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///checkout/obj/build/rls-test-data/test_data/multiple_bins/Cargo.toml"}}`', tools/rls/src/test/harness.rs:227:9
[02:10:20] ---- test::test_no_default_features stdout ----
[02:10:20] ---- test::test_no_default_features stdout ----
[02:10:20] thread 'test::test_no_default_features' panicked at 'Assert failed: Could not find `"message":"cannot find struct, variant or union type `Baz` in this scope` in `{"jsonrpc":"2.0","method":"textDocument/publishDiagnostics","params":{"diagnostics":[{"message":"failed to load source for a dependency on `fnv`\nUnable to update registry `https://github.com/rust-lang/crates.io-index`\nfailed to fetch `https://github.com/rust-lang/crates.io-index`\ncurl error: Could not resolve host: github.com\n; class=Net (12)","range":{"end":{"character":0,"line":9999},"start":{"character":0,"line":0}},"severity":1}],"uri":"file:///checkout/obj/build/rls-test-data/test_data/features/Cargo.toml"}}`', tools/rls/src/test/harness.rs:227:9
[02:10:20] ---- test::test_reformat_with_range stdout ----
[02:10:20] ---- test::test_reformat_with_range stdout ----
[02:10:20] thread 'test::test_reformat_with_range' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_reformat stdout ----
[02:10:20] ---- test::test_reformat stdout ----
[02:10:20] thread 'test::test_reformat' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_rename stdout ----
[02:10:20] ---- test::test_rename stdout ----
[02:10:20] thread 'test::test_rename' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_shutdown stdout ----
[02:10:20] ---- test::test_shutdown stdout ----
[02:10:20] thread 'test::test_shutdown' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_workspace_symbol stdout ----
[02:10:20] ---- test::test_workspace_symbol stdout ----
[02:10:20] thread 'test::test_workspace_symbol' panicked at 'Missing id field', libcore/option.rs:1008:5
[02:10:20] ---- test::test_workspace_symbol_duplicates stdout ----
[02:10:20] ---- test::test_workspace_symbol_duplicates stdout ----
[02:10:20] thread 'test::test_workspace_symbol_duplicates' panicked at 'called `Option::unwrap()` on a `None` value', libcore/option.rs:355:21
[02:10:20] 
[02:10:20] failures:
[02:10:20]     test::lens::test_lens_run
[02:10:20]     test::test_all_targets

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 23, 2018

⌛ Testing commit 659fcb9 with merge 1c16fa4...

bors added a commit that referenced this pull request Nov 23, 2018
[beta] Rollup backports

* #56163: [master] Backport 1.30.1 release notes
* #56147: resolve: Fix some asserts in import validation
* #56118: Update books for Rust 2018
* #56117: resolve: Make "empty import canaries" invisible from other crates
* #56065: Replace the ICEing on const fn loops with an error
* #56143: Issue 56128 segment id ice nightly
* #56134: Fix clippy documentation links (first in #56156)

r? @ghost
@bors
Copy link
Contributor

bors commented Nov 23, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 1c16fa4 to beta...

@bors bors merged commit 659fcb9 into rust-lang:beta Nov 23, 2018
@pietroalbini pietroalbini deleted the beta-rollup branch November 23, 2018 12:52
@alexcrichton alexcrichton added this to the Rust 2018 Release milestone Nov 23, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.