Make opaque::Encoder append-only and make it infallible #51356

Zoxc · 2018-06-04T20:14:44Z

No description provided.

rust-highfive · 2018-06-04T20:14:47Z

(rust_highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2018-06-04T21:16:50Z

The job x86_64-gnu-llvm-3.9 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.

[00:41:35] ............................................................................i.......................
[00:41:39] ....................................................................................................
[00:41:45] ....................................................................................................
[00:41:50] ....................................................................................................
[00:41:55] .........i.................iiiiiiiii...................................................
[00:41:55] 
[00:41:55] travis_fold:start:test_ui_nll
travis_time:start:test_ui_nll
Check compiletest suite=ui mode=ui compare_mode=nll (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
[00:42:42] ............................................................................i.......................
[00:42:47] ....................................................................................................
[00:42:51] ....................................................................................................
[00:42:57] ....................................................................................................
[00:43:01] .........i.................iiiiiiiii...................................................
[00:43:01] 
[00:43:01]  finished in 66.207
[00:43:01] travis_fold:end:test_ui_nll

---
travis_time:start:test_run-pass-fulldeps
Check compiletest suite=run-pass-fulldeps mode=run-pass (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[00:55:27] 
[00:55:27] running 92 tests
[00:57:10] ............F..............................................................test [run-pass] run-pass-fulldeps/myriad-closures.rs has been running for over 60 seconds
[00:59:43] failures:
[00:59:43] thread 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:498:22
[00:59:43] 
[00:59:43] ---- [run-pass] run-pass-fulldeps/issue-11881.rs stdout ----
[00:59:43] ---- [run-pass] run-pass-fulldeps/issue-11881.rs stdout ----
[00:59:43] 
[00:59:43] error: compilation failed!
[00:59:43] status: exit code: 101
[00:59:43] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/run-pass-fulldeps/issue-11881.rs" "--target=x86_64-unknown-linux-gnu" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass-fulldeps/issue-11881/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass-fulldeps/issue-11881/auxiliary"
[00:59:43] ------------------------------------------
[00:59:43] 
[00:59:43] ------------------------------------------
[00:59:43] stderr:
[00:59:43] stderr:
[00:59:43] ------------------------------------------
[00:59:43] warning: derive(Encodable) is deprecated in favor of derive(RustcEncodable)
[00:59:43]   --> /checkout/src/test/run-pass-fulldeps/issue-11881.rs:25:10
[00:59:43]    |
[00:59:43] 25 | #[derive(Encodable)]
[00:59:43] 
[00:59:43] 
[00:59:43] warning: derive(Encodable) is deprecated in favor of derive(RustcEncodable)
[00:59:43]   --> /checkout/src/test/run-pass-fulldeps/issue-11881.rs:30:10
[00:59:43]    |
[00:59:43] 30 | #[derive(Encodable)]
[00:59:43] 
[00:59:43] warning: unused import: `std::fmt`
[00:59:43]   --> /checkout/src/test/run-pass-fulldeps/issue-11881.rs:18:5
[00:59:43]    |
---
[00:59:43] 
[00:59:43] error[E0308]: mismatched types
[00:59:43]   --> /checkout/src/test/run-pass-fulldeps/issue-11881.rs:45:44
[00:59:43]    |
[00:59:43] 45 |     let mut encoder = opaque::Encoder::new(wr);
[00:59:43]    |                                            ^^ expected struct `std::vec::Vec`, found mutable reference
[00:59:43]    = note: expected type `std::vec::Vec<u8>`
[00:59:43]    = note: expected type `std::vec::Vec<u8>`
[00:59:43]               found type `&mut std::io::Cursor<std::vec::Vec<u8>>`
[00:59:43] error: aborting due to previous error
[00:59:43] 
[00:59:43] For more information about this error, try `rustc --explain E0308`.
[00:59:43] 
---
[00:59:43] test result: FAILED. 91 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[00:59:43] 
[00:59:43] 
[00:59:43] 
[00:59:43] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/run-pass-fulldeps" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass-fulldeps" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-pass" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-3.9/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "3.9.1\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[00:59:43] 
[00:59:43] 
[00:59:43] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[00:59:43] Build completed unsuccessfully in 0:20:13
[00:59:43] Build completed unsuccessfully in 0:20:13
[00:59:43] make: *** [check] Error 1
[00:59:43] Makefile:58: recipe for target 'check' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:21543c9a
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

petrochenkov · 2018-06-09T15:51:27Z

r? @michaelwoerister

michaelwoerister · 2018-06-09T17:18:57Z

src/librustc_incremental/persist/save.rs

@@ -246,13 +234,12 @@ fn encode_work_product_index(work_products: &FxHashMap<WorkProductId, WorkProduc
        })
        .collect();

-    serialized_products.encode(encoder)
+    serialized_products.encode(encoder).ok();


Should this be .unwrap() too?

michaelwoerister · 2018-06-09T17:22:42Z

Thanks, @Zoxc! Looking forward to seeing perf results for this.

bors · 2018-06-16T11:01:35Z

☔ The latest upstream changes (presumably #51550) made this pull request unmergeable. Please resolve the merge conflicts.

Zoxc · 2018-06-20T15:39:16Z

@bors try

bors · 2018-06-20T15:39:28Z

⌛ Trying commit b81b8c8e43fbc0f034a7dcc5b953c556decce369 with merge 65721b9a2f5ee3bedc07c1feda5151dd628cb281...

Zoxc · 2018-06-21T05:38:07Z

@bors try

bors · 2018-06-21T05:38:18Z

⌛ Trying commit 3c4c199 with merge adf5f39d6e953606d6012b55d0581e8a1dab7eeb...

bors · 2018-06-21T06:54:18Z

💔 Test failed - status-travis

kennytm · 2018-06-21T07:37:52Z

@bors retry

bors · 2018-06-21T07:38:02Z

⌛ Trying commit 3c4c199 with merge 9c65854...

[WIP] Make opaque::Encoder append-only and make it infallible

bors · 2018-06-21T09:17:16Z

☀️ Test successful - status-travis
State: approved= try=True

kennytm · 2018-06-21T09:23:09Z

@Mark-Simulacrum Perf wanted, try#9c65854f4625cef1263b8a6183df0f9a60fea907 vs master#fff1abadd7a4ec861ca4b9c77035379578ef033d.

Mark-Simulacrum · 2018-06-21T13:10:50Z

We'll need to wait for #51680 to merge before collecting perf becomes feasible.

Zoxc · 2018-06-21T15:50:36Z

@bors try

Zoxc · 2018-06-21T16:01:41Z

@bors try

bors · 2018-06-21T16:01:51Z

⌛ Trying commit 1d32ea7 with merge c950d13fe90f13c233b24c7b40c822329e74cd3d...

bors · 2018-06-21T16:02:07Z

💔 Test failed - status-travis

kennytm · 2018-06-21T18:52:30Z

@bors try retry

bors · 2018-06-21T18:52:59Z

⌛ Trying commit 1d32ea7 with merge ec349a9...

[WIP] Make opaque::Encoder append-only and make it infallible

bors · 2018-06-21T20:46:33Z

☀️ Test successful - status-travis
State: approved= try=True

Zoxc · 2018-06-23T07:45:19Z

Perf link when done: https://perf.rust-lang.org/compare.html?start=f790780451a724dce9be0ba03ff217955036ff88&end=ec349a9683138a28c5cb45a0492a292c66e64a68&stat=instructions%3Au

Zoxc · 2018-06-25T18:05:09Z

@Mark-Simulacrum A perf run is still wanted here

Mark-Simulacrum · 2018-06-25T18:08:09Z

I've queued the run.

michaelwoerister · 2018-06-26T12:43:10Z

Perf looks awesome! r=me with that one nit fixed.

Zoxc · 2018-06-27T14:00:12Z

@bors r=michaelwoerister

bors · 2018-06-27T14:00:14Z

📌 Commit 14d3c6e has been approved by michaelwoerister

bors · 2018-06-27T14:25:59Z

⌛ Testing commit 14d3c6e with merge ed0350e...

Make opaque::Encoder append-only and make it infallible

bors · 2018-06-27T16:43:42Z

☀️ Test successful - status-appveyor, status-travis
Approved by: michaelwoerister
Pushing ed0350e to master...

rust-highfive assigned petrochenkov Jun 4, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 4, 2018

rust-highfive assigned michaelwoerister and unassigned petrochenkov Jun 9, 2018

michaelwoerister reviewed Jun 9, 2018

View reviewed changes

Zoxc force-pushed the encode-cleanup branch from b4616d6 to b81b8c8 Compare June 20, 2018 14:19

This comment has been minimized.

# to view

Zoxc force-pushed the encode-cleanup branch from b81b8c8 to e115792 Compare June 20, 2018 16:40

This comment has been minimized.

# to view

bors 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 Jun 21, 2018

This comment has been minimized.

# to view

bors added a commit that referenced this pull request Jun 21, 2018

Auto merge of #51356 - Zoxc:encode-cleanup, r=<try>

9c65854

[WIP] Make opaque::Encoder append-only and make it infallible

rust-lang deleted a comment from rust-highfive Jun 21, 2018

kennytm added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 21, 2018

kennytm mentioned this pull request Jun 21, 2018

Combine all builtin late lints #51678

Merged

Zoxc force-pushed the encode-cleanup branch from 3c4c199 to 1d32ea7 Compare June 21, 2018 16:01

bors added a commit that referenced this pull request Jun 21, 2018

Auto merge of #51356 - Zoxc:encode-cleanup, r=<try>

ec349a9

[WIP] Make opaque::Encoder append-only and make it infallible

Make opaque::Encoder append-only and make it infallible

14d3c6e

Zoxc force-pushed the encode-cleanup branch from 1d32ea7 to 14d3c6e Compare June 27, 2018 09:43

Zoxc changed the title ~~[WIP] Make opaque::Encoder append-only and make it infallible~~ Make opaque::Encoder append-only and make it infallible Jun 27, 2018

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 Jun 27, 2018

bors added a commit that referenced this pull request Jun 27, 2018

Auto merge of #51356 - Zoxc:encode-cleanup, r=michaelwoerister

ed0350e

Make opaque::Encoder append-only and make it infallible

bors merged commit 14d3c6e into rust-lang:master Jun 27, 2018

Zoxc deleted the encode-cleanup branch June 29, 2018 10:28

Make opaque::Encoder append-only and make it infallible #51356

Make opaque::Encoder append-only and make it infallible #51356

Uh oh!

Conversation

Zoxc commented Jun 4, 2018

Uh oh!

rust-highfive commented Jun 4, 2018

Uh oh!

rust-highfive commented Jun 4, 2018

Uh oh!

petrochenkov commented Jun 9, 2018

Uh oh!

michaelwoerister Jun 9, 2018

Choose a reason for hiding this comment

Uh oh!

michaelwoerister commented Jun 9, 2018

Uh oh!

bors commented Jun 16, 2018

Uh oh!

Zoxc commented Jun 20, 2018

Uh oh!

bors commented Jun 20, 2018

Uh oh!

This comment has been minimized.

This comment has been minimized.

Zoxc commented Jun 21, 2018

Uh oh!

bors commented Jun 21, 2018

Uh oh!

bors commented Jun 21, 2018

Uh oh!

This comment has been minimized.

kennytm commented Jun 21, 2018

Uh oh!

bors commented Jun 21, 2018

Uh oh!

bors commented Jun 21, 2018

Uh oh!

kennytm commented Jun 21, 2018

Uh oh!

Mark-Simulacrum commented Jun 21, 2018

Uh oh!

Zoxc commented Jun 21, 2018

Uh oh!

Zoxc commented Jun 21, 2018

Uh oh!

bors commented Jun 21, 2018

Uh oh!

bors commented Jun 21, 2018

Uh oh!

kennytm commented Jun 21, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Jun 21, 2018

Uh oh!

bors commented Jun 21, 2018

Uh oh!

Zoxc commented Jun 23, 2018

Uh oh!

Zoxc commented Jun 25, 2018

Uh oh!

Mark-Simulacrum commented Jun 25, 2018

Uh oh!

michaelwoerister commented Jun 26, 2018

Uh oh!

Zoxc commented Jun 27, 2018

Uh oh!

bors commented Jun 27, 2018

Uh oh!

bors commented Jun 27, 2018

Uh oh!

bors commented Jun 27, 2018

Uh oh!

Uh oh!

kennytm commented Jun 21, 2018 •

edited

Loading