replace serialize with serde in rustdoc #62359

euclio · 2019-07-04T00:50:46Z

This is a slightly less aggressive version of #61028.

GuillaumeGomez · 2019-07-04T12:11:40Z

src/librustdoc/html/render.rs

+    #[derive(Serialize)]
+    struct CrateData<'a> {
+        doc: String,
+        #[serde(rename = "i")]


That makes it so much simpler to understand! \o/

GuillaumeGomez · 2019-07-04T12:13:33Z

If the generated index is the same as before, then it's all good for me. I'd just prefer if @QuietMisdreavus took a look to confirm and then here we go. Thanks a lot!

edmilsonefs · 2019-07-22T20:02:16Z

Hey! This is a ping from triage, we would like to know if you @QuietMisdreavus could give us a few minutes to share your thoughts on it.

Thanks.

Dylan-DPC-zz · 2019-07-22T21:07:52Z

r? @QuietMisdreavus

QuietMisdreavus · 2019-07-07T02:59:54Z

src/librustdoc/html/render.rs

+            &self.desc,
+            self.parent_idx,
+            &self.search_type,
+        )


Is a tuple the right construct for this? Do serialize_tuple and serialize_seq come out the same when run through serde_json?

They will be serialized the same way. This way, it saves the intermediate step of serializing everything to Value to make a Vec<Value>.

bors · 2019-08-02T19:08:59Z

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

totsteps · 2019-08-06T18:23:05Z

Ping from triage, @euclio please resolve the merge conflicts. Thanks

euclio · 2019-08-10T16:43:47Z

Rebased.

JohnCSimon · 2019-08-17T07:06:01Z

Ping from triage
@QuietMisdreavus @GuillaumeGomez - can you please review this?

Thank you!

GuillaumeGomez · 2019-08-19T08:16:59Z

Looks good to me. Just one question: is there any difference in term of performance?

bors · 2019-08-19T20:46:39Z

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

Mark-Simulacrum · 2019-08-25T15:42:08Z

I'm going to approve this per #62359 (comment) (and I've done my own review-ish, without trying to get into details of one to one compat).

@bors r+

We're still fairly early in the release cycle as well so if something comes up we can revert, and since I'll be touching some of this code in some of my PRs I'd like to avoid conflicts.

bors · 2019-08-25T15:42:09Z

📌 Commit 972f0e07334917ea4690185a07b50c7ed557c5ea has been approved by Mark-Simulacrum

bors · 2019-08-25T23:01:34Z

⌛ Testing commit 972f0e07334917ea4690185a07b50c7ed557c5ea with merge 1675253b27b29808f17637a617b0edfe3e5374d5...

bors · 2019-08-26T00:27:07Z

💔 Test failed - checks-azure

rust-highfive · 2019-08-26T00:27:08Z

The job dist-x86_64-freebsd of your PR failed (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-08-25T23:02:47.9226087Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-25T23:02:47.9226320Z 
2019-08-25T23:02:47.9226740Z   git checkout -b <new-branch-name>
2019-08-25T23:02:47.9226965Z 
2019-08-25T23:02:47.9227452Z HEAD is now at 1675253b2 Auto merge of #62359 - euclio:remove-serialize, r=Mark-Simulacrum
2019-08-25T23:02:47.9397173Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-25T23:02:47.9400230Z ==============================================================================
2019-08-25T23:02:47.9400335Z Task         : Bash
2019-08-25T23:02:47.9400574Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-26T00:25:40.7092544Z 115 | extern crate serde;
2019-08-26T00:25:40.7093627Z     | ^^^^^^^^^^^^^^^^^^^
2019-08-26T00:25:40.7093912Z     |
2019-08-26T00:25:40.7094215Z     = note: candidates:
2019-08-26T00:25:40.7094598Z             crate `serde_derive`: /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/release/deps/libserde_derive-27e74de8ef325fe1.so
2019-08-26T00:25:40.7095016Z             crate `serde_derive`: /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/release/deps/libserde_derive-ed16a85fe0a4b337.so
2019-08-26T00:25:40.7099943Z 
2019-08-26T00:25:40.7128251Z error[E0461]: couldn't find crate `serde_derive` with expected target triple x86_64-unknown-linux-gnu which `serde` depends on
2019-08-26T00:25:40.7130924Z     |
2019-08-26T00:25:40.7131205Z 115 | extern crate serde;
2019-08-26T00:25:40.7131502Z     | ^^^^^^^^^^^^^^^^^^^
2019-08-26T00:25:40.7131729Z     |
---
2019-08-26T00:25:40.8610490Z == clock drift check ==
2019-08-26T00:25:40.8630504Z   local time: Mon Aug 26 00:25:40 UTC 2019
2019-08-26T00:25:41.0176008Z   network time: Mon, 26 Aug 2019 00:25:41 GMT
2019-08-26T00:25:41.0178845Z == end clock drift check ==
2019-08-26T00:25:42.9536634Z ##[error]Bash exited with code '1'.
2019-08-26T00:25:42.9578911Z ##[section]Starting: Upload CPU usage statistics
2019-08-26T00:25:42.9585997Z ==============================================================================
2019-08-26T00:25:42.9586090Z Task         : Bash
2019-08-26T00:25:42.9586177Z Description  : Run a Bash script on macOS, Linux, or Windows

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)

Dylan-DPC-zz · 2019-08-26T12:33:00Z

@euclio you need to address the failing tests

Dylan-DPC-zz · 2019-11-30T00:42:42Z

retrying it

Dylan-DPC-zz · 2019-12-05T10:49:08Z

@euclio any updates on this?

euclio · 2019-12-05T19:53:07Z

@Dylan-DPC Needs a retry, looks like the last one didn't happen.

bors · 2019-12-05T20:58:11Z

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

Dylan-DPC-zz · 2019-12-06T20:25:24Z

@bors retry

bors · 2019-12-11T05:33:31Z

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

euclio · 2019-12-13T15:29:34Z

Rebased.

Dylan-DPC-zz · 2019-12-13T16:10:15Z

@bors r+ rollup=never

bors · 2019-12-13T16:10:17Z

📌 Commit 94630d4 has been approved by Dylan-DPC

bors · 2019-12-13T16:14:53Z

⌛ Testing commit 94630d4 with merge 703c82e...

@GuillaumeGomez

replace serialize with serde in rustdoc This is a slightly less aggressive version of #61028. r? @GuillaumeGomez

bors · 2019-12-13T19:39:13Z

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 703c82e to master...

rust-highfive assigned GuillaumeGomez Jul 4, 2019

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

GuillaumeGomez reviewed Jul 4, 2019

View reviewed changes

rust-highfive assigned QuietMisdreavus and unassigned GuillaumeGomez Jul 22, 2019

QuietMisdreavus reviewed Jul 25, 2019

View reviewed changes

euclio force-pushed the remove-serialize branch from 2603f32 to 698a239 Compare August 10, 2019 04:43

euclio force-pushed the remove-serialize branch from 698a239 to 972f0e0 Compare August 20, 2019 02:27

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 Aug 25, 2019

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 Aug 26, 2019

Dylan-DPC-zz 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 Aug 26, 2019

Dylan-DPC-zz 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 29, 2019

Dylan-DPC-zz closed this Nov 30, 2019

Dylan-DPC-zz reopened this Nov 30, 2019

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 Dec 6, 2019

euclio force-pushed the remove-serialize branch from b87dd82 to d2fe425 Compare December 10, 2019 18:34

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 11, 2019

replace serialize with serde in rustdoc

94630d4

euclio force-pushed the remove-serialize branch from d2fe425 to 94630d4 Compare December 12, 2019 21:35

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 Dec 13, 2019

bors added a commit that referenced this pull request Dec 13, 2019

Auto merge of #62359 - euclio:remove-serialize, r=Dylan-DPC

703c82e

replace serialize with serde in rustdoc This is a slightly less aggressive version of #61028. r? @GuillaumeGomez

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 13, 2019

bors merged commit 94630d4 into rust-lang:master Dec 13, 2019

euclio deleted the remove-serialize branch December 13, 2019 22:08

nlinker mentioned this pull request May 15, 2020

Перевод "Five years of Rust" rust-lang-ru/translations#58

Merged

6 tasks

jyn514 mentioned this pull request Mar 16, 2021

Switch JSON serialization from rustc_serialize to serde rust-lang/compiler-team#418

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

replace serialize with serde in rustdoc #62359

replace serialize with serde in rustdoc #62359

euclio commented Jul 4, 2019

GuillaumeGomez Jul 4, 2019

GuillaumeGomez commented Jul 4, 2019

edmilsonefs commented Jul 22, 2019

Dylan-DPC-zz commented Jul 22, 2019

QuietMisdreavus Jul 7, 2019

euclio Jul 27, 2019

bors commented Aug 2, 2019

totsteps commented Aug 6, 2019

euclio commented Aug 10, 2019

JohnCSimon commented Aug 17, 2019

GuillaumeGomez commented Aug 19, 2019

bors commented Aug 19, 2019

Mark-Simulacrum commented Aug 25, 2019

bors commented Aug 25, 2019

bors commented Aug 25, 2019

bors commented Aug 26, 2019

rust-highfive commented Aug 26, 2019

Dylan-DPC-zz commented Aug 26, 2019

Dylan-DPC-zz commented Nov 30, 2019

Dylan-DPC-zz commented Dec 5, 2019

euclio commented Dec 5, 2019

bors commented Dec 5, 2019

Dylan-DPC-zz commented Dec 6, 2019

bors commented Dec 11, 2019

euclio commented Dec 13, 2019

Dylan-DPC-zz commented Dec 13, 2019

bors commented Dec 13, 2019

bors commented Dec 13, 2019

bors commented Dec 13, 2019

replace serialize with serde in rustdoc #62359

replace serialize with serde in rustdoc #62359

Conversation

euclio commented Jul 4, 2019

GuillaumeGomez Jul 4, 2019

Choose a reason for hiding this comment

GuillaumeGomez commented Jul 4, 2019

edmilsonefs commented Jul 22, 2019

Dylan-DPC-zz commented Jul 22, 2019

QuietMisdreavus Jul 7, 2019

Choose a reason for hiding this comment

euclio Jul 27, 2019

Choose a reason for hiding this comment

bors commented Aug 2, 2019

totsteps commented Aug 6, 2019

euclio commented Aug 10, 2019

JohnCSimon commented Aug 17, 2019

GuillaumeGomez commented Aug 19, 2019

bors commented Aug 19, 2019

Mark-Simulacrum commented Aug 25, 2019

bors commented Aug 25, 2019

bors commented Aug 25, 2019

bors commented Aug 26, 2019

rust-highfive commented Aug 26, 2019

Dylan-DPC-zz commented Aug 26, 2019

Dylan-DPC-zz commented Nov 30, 2019

Dylan-DPC-zz commented Dec 5, 2019

euclio commented Dec 5, 2019

bors commented Dec 5, 2019

Dylan-DPC-zz commented Dec 6, 2019

bors commented Dec 11, 2019

euclio commented Dec 13, 2019

Dylan-DPC-zz commented Dec 13, 2019

bors commented Dec 13, 2019

bors commented Dec 13, 2019

bors commented Dec 13, 2019