Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
Zoxc:encode-cleanup
Jun 27, 2018
Merged

Make opaque::Encoder append-only and make it infallible#51356
bors merged 1 commit into
rust-lang:masterfrom
Zoxc:encode-cleanup

Conversation

@Zoxc

@ZoxcZoxc commented Jun 4, 2018

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

rust-highfive commented Jun 4, 2018

Copy link
Copy Markdown
Contributor

r? @petrochenkov

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

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

rust-highfive commented Jun 4, 2018

Copy link
Copy Markdown
Contributor

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

petrochenkov commented Jun 9, 2018

Copy link
Copy Markdown
Contributor

r? @michaelwoerister

michaelwoerister
michaelwoerister reviewed Jun 9, 2018
View reviewed changes
Comment threadsrc/librustc_incremental/persist/save.rs Outdated

@michaelwoeristermichaelwoeristerJun 9, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be .unwrap() too?

@michaelwoerister

michaelwoerister commented Jun 9, 2018

Copy link
Copy Markdown
Member

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

@bors

bors commented Jun 16, 2018

Copy link
Copy Markdown
Collaborator

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

@Zoxc

Zoxc commented Jun 20, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors try

@bors

bors commented Jun 20, 2018

Copy link
Copy Markdown
Collaborator

⌛ Trying commit b81b8c8e43fbc0f034a7dcc5b953c556decce369 with merge 65721b9a2f5ee3bedc07c1feda5151dd628cb281...

@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@Zoxc

Zoxc commented Jun 21, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors try

@bors

bors commented Jun 21, 2018

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 3c4c199 with merge adf5f39d6e953606d6012b55d0581e8a1dab7eeb...

@bors

bors commented Jun 21, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@borsbors 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
@rust-highfive

This comment has been minimized.

Sign in to view
@kennytm

kennytm commented Jun 21, 2018

Copy link
Copy Markdown
Member

@bors retry

@bors

bors commented Jun 21, 2018

Copy link
Copy Markdown
Collaborator

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

bors added a commit that referenced this pull request Jun 21, 2018
@bors
Auto merge of#51356- Zoxc:encode-cleanup, r=<try>
9c65854
[WIP] Make opaque::Encoder append-only and make it infallible
@rust-langrust-lang deleted a comment from rust-highfiveJun 21, 2018
@bors

bors commented Jun 21, 2018

Copy link
Copy Markdown
Collaborator

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

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

kennytm commented Jun 21, 2018

Copy link
Copy Markdown
Member

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

@Mark-Simulacrum

Mark-Simulacrum commented Jun 21, 2018

Copy link
Copy Markdown
Member

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

@kennytmkennytm mentioned this pull request Jun 21, 2018
Merged
@Zoxc

Zoxc commented Jun 21, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors try

@Zoxc

Zoxc commented Jun 21, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors try

@bors

bors commented Jun 21, 2018

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 1d32ea7 with merge c950d13fe90f13c233b24c7b40c822329e74cd3d...

@bors

bors commented Jun 21, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@kennytm

kennytm commented Jun 21, 2018•
edited
Loading

Copy link
Copy Markdown
Member

@bors try retry

@bors

bors commented Jun 21, 2018

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 1d32ea7 with merge ec349a9...

bors added a commit that referenced this pull request Jun 21, 2018
@bors
Auto merge of#51356- Zoxc:encode-cleanup, r=<try>
ec349a9
[WIP] Make opaque::Encoder append-only and make it infallible
@bors

bors commented Jun 21, 2018

Copy link
Copy Markdown
Collaborator

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

@Zoxc

Zoxc commented Jun 23, 2018

Copy link
Copy Markdown
ContributorAuthor

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

@Zoxc

Zoxc commented Jun 25, 2018

Copy link
Copy Markdown
ContributorAuthor

@Mark-Simulacrum A perf run is still wanted here

@Mark-Simulacrum

Mark-Simulacrum commented Jun 25, 2018

Copy link
Copy Markdown
Member

I've queued the run.

@michaelwoerister

michaelwoerister commented Jun 26, 2018

Copy link
Copy Markdown
Member

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

@ZoxcZoxc changed the title [WIP] Make opaque::Encoder append-only and make it infallibleMake opaque::Encoder append-only and make it infallibleJun 27, 2018
@Zoxc

Zoxc commented Jun 27, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors r=michaelwoerister

@bors

bors commented Jun 27, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 14d3c6e has been approved by michaelwoerister

@borsbors 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

bors commented Jun 27, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 14d3c6e with merge ed0350e...

bors added a commit that referenced this pull request Jun 27, 2018
@bors
Auto merge of#51356- Zoxc:encode-cleanup, r=michaelwoerister
ed0350e
Make opaque::Encoder append-only and make it infallible
@bors

bors commented Jun 27, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 14d3c6e into rust-lang:masterJun 27, 2018
@Zoxc
Zoxc deleted the encode-cleanup branch June 29, 2018 10:28
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@michaelwoeristermichaelwoeristermichaelwoerister left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@michaelwoeristermichaelwoerister

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.S-waiting-on-perfStatus: Waiting on a perf run to be completed.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@Zoxc@rust-highfive@petrochenkov@michaelwoerister@bors@kennytm@Mark-Simulacrum