Reduce search-index.js size by GuillaumeGomez · Pull Request #56869 · rust-lang/rust

GuillaumeGomez · 2018-12-16T01:36:45Z

Coming from:

1735683 Dec 16 01:35 build/x86_64-apple-darwin/doc/search-index.js

to:

727755 Dec 16 01:51 build/x86_64-apple-darwin/doc/search-index.js

r? @QuietMisdreavus

QuietMisdreavus

At some point we should probably get more eyes and hands on the minifier crate. I just read over the changes and it looks clever. Doesn't seem to introduce any errors either, at least based on personally generating the std docs and looking in the console. And it gives some impressive results! Great work!

QuietMisdreavus · 2018-12-19T21:23:31Z

@bors r+

(i'd mark it rollup but lockfile changes are kinda problematic to roll up...)

bors · 2018-12-19T21:23:32Z

📌 Commit bf4a984 has been approved by QuietMisdreavus

@QuietMisdreavus

…, r=QuietMisdreavus Reduce search-index.js size Coming from: ``` 1735683 Dec 16 01:35 build/x86_64-apple-darwin/doc/search-index.js ``` to: ``` 727755 Dec 16 01:51 build/x86_64-apple-darwin/doc/search-index.js ``` r? @QuietMisdreavus

@QuietMisdreavus

…, r=QuietMisdreavus Reduce search-index.js size Coming from: ``` 1735683 Dec 16 01:35 build/x86_64-apple-darwin/doc/search-index.js ``` to: ``` 727755 Dec 16 01:51 build/x86_64-apple-darwin/doc/search-index.js ``` r? @QuietMisdreavus

@ghost

Rollup of 20 pull requests Successful merges: - #56802 (Add DoubleEndedIterator::nth_back) - #56842 (Add unstable VecDeque::rotate_{left|right}) - #56869 (Reduce search-index.js size) - #56887 (Disable field reordering for repr(int).) - #56892 (rustc: Update Clang used to build LLVM on Linux) - #56909 (static eval: Do not ICE on layout size overflow) - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le) - #56917 (Simplify MIR generation for logical operations) - #56919 (Remove a wrong multiplier on relocation offset computation) - #56933 (Add --progress to git submodule commands in x.py) - #56941 (deny intra-doc link resolution failures in libstd) - #56964 (Remove `TokenStream::JointTree`.) - #56970 (Mem uninit doc ptr drop) - #56973 (make basic CTFE tracing available on release builds) - #56979 (Adding unwinding support for x86_64_fortanix_unknown_sgx target.) - #56981 (miri: allocation is infallible) - #56984 (A few tweaks to dropck_outlives) - #56989 (Fix compiletest `trim` deprecation warnings) - #56992 (suggest similar lint names for unknown lints) - #57002 (Stabilize Vec(Deque)::resize_with) Failed merges: r? @ghost

@ghost

Rollup of 20 pull requests Successful merges: - #56802 (Add DoubleEndedIterator::nth_back) - #56842 (Add unstable VecDeque::rotate_{left|right}) - #56869 (Reduce search-index.js size) - #56887 (Disable field reordering for repr(int).) - #56892 (rustc: Update Clang used to build LLVM on Linux) - #56909 (static eval: Do not ICE on layout size overflow) - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le) - #56917 (Simplify MIR generation for logical operations) - #56919 (Remove a wrong multiplier on relocation offset computation) - #56933 (Add --progress to git submodule commands in x.py) - #56941 (deny intra-doc link resolution failures in libstd) - #56964 (Remove `TokenStream::JointTree`.) - #56970 (Mem uninit doc ptr drop) - #56973 (make basic CTFE tracing available on release builds) - #56979 (Adding unwinding support for x86_64_fortanix_unknown_sgx target.) - #56981 (miri: allocation is infallible) - #56984 (A few tweaks to dropck_outlives) - #56989 (Fix compiletest `trim` deprecation warnings) - #56992 (suggest similar lint names for unknown lints) - #57002 (Stabilize Vec(Deque)::resize_with) Failed merges: r? @ghost

@QuietMisdreavus

…, r=QuietMisdreavus Reduce search-index.js size Coming from: ``` 1735683 Dec 16 01:35 build/x86_64-apple-darwin/doc/search-index.js ``` to: ``` 727755 Dec 16 01:51 build/x86_64-apple-darwin/doc/search-index.js ``` r? @QuietMisdreavus

GuillaumeGomez · 2018-12-24T17:20:58Z

@bors: r=QuietMisdreavus p=1

bors · 2018-12-24T17:20:59Z

📌 Commit a4e62487cd44cca9f78a1c32a3d2366b12ed2c8f has been approved by QuietMisdreavus

bors · 2018-12-24T18:52:06Z

⌛ Testing commit a4e62487cd44cca9f78a1c32a3d2366b12ed2c8f with merge b5809731f172ac2a0ba12bec0d1fa557c9224342...

GuillaumeGomez · 2019-01-15T12:50:55Z

Nooooooo...

QuietMisdreavus · 2019-01-15T14:53:25Z

lockfiles...

r=me when travis is green. Should we bump priority to try to beat any other PRs that touch the lockfile, or hope that the age of this one will let it jump the queue naturally?

GuillaumeGomez · 2019-01-15T14:59:08Z

it's alphabetically sorted iirc so I'll just put a high priority (like 10).

GuillaumeGomez · 2019-01-15T15:38:35Z

@bors: r=QuietMisdreavus p=10

bors · 2019-01-15T15:38:36Z

📌 Commit 7105a16f87885831c3b885d420114f48c54a7903 has been approved by QuietMisdreavus

bors · 2019-01-15T16:35:31Z

⌛ Testing commit 7105a16f87885831c3b885d420114f48c54a7903 with merge 01646444c20351d4d80b4d5ad15bee2f7e59622a...

bors · 2019-01-15T18:41:05Z

💔 Test failed - status-appveyor

QuietMisdreavus · 2019-01-15T19:00:17Z

Checking "substring.js" ... FAILED
==> Exact check failed at position 2: expected '{"path":"std","name":"assert"}' but found '{"crate":"core","ty":14,"name":"debug_assert_eq","path":"core","desc":"Asserts that two expressions are equal to each other.","type":null,"lev":0,"displayPath":"<span>core::</span>","fullPath":"<span>core::</span>debug_assert_eq|14","href":"../core/macro.debug_assert_eq.html"}'

GuillaumeGomez · 2019-01-15T19:45:14Z

Ah, exact check might be a problem here.

GuillaumeGomez · 2019-01-16T18:27:14Z

Remove the changes in the test (so we're back to the original one). Let's hope we won't have issues with the lock file either!

@bors: r=QuietMisdreavus p=10

bors · 2019-01-16T18:27:15Z

📌 Commit 3a311858f7e6d87111eccaadaedcfd7248ac2089 has been approved by QuietMisdreavus

GuillaumeGomez · 2019-01-16T22:12:19Z

Weird, the PR isn't in the build queue anymore... Let's try again?

@bors: r=QuietMisdreavus p=10

bors · 2019-01-16T22:12:20Z

📌 Commit 3a311858f7e6d87111eccaadaedcfd7248ac2089 has been approved by QuietMisdreavus

bors · 2019-01-16T23:25:36Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout index-size-reduction(switch to your branch)
git fetch upstream master(retrieve the latest master)
git rebase upstream/master -p(rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self index-size-reduction --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/librustdoc/html/static/main.js
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

GuillaumeGomez · 2019-01-17T00:41:53Z

And after a rebase, let's go again...

@bors: r=QuietMisdreavus p=10

bors · 2019-01-17T00:41:54Z

📌 Commit d405606 has been approved by QuietMisdreavus

bors · 2019-01-17T02:12:24Z

⌛ Testing commit d405606 with merge 956dba4...

bors · 2019-01-17T05:00:09Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: QuietMisdreavus
Pushing 956dba4 to master...

rust-highfive assigned QuietMisdreavus Dec 16, 2018

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

QuietMisdreavus approved these changes Dec 19, 2018
View reviewed changes

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 Dec 19, 2018

emilyalbini mentioned this pull request Dec 20, 2018
Rollup of 19 pull requests #57005
Closed

emilyalbini mentioned this pull request Dec 21, 2018
Rollup of 20 pull requests #57025
Closed

Centril mentioned this pull request Dec 22, 2018
Rollup of 41 pull requests #57058
Closed

kennytm mentioned this pull request Dec 22, 2018
Rollup of 25 pull requests #57063
Merged

This comment has been minimized.
Sign in 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 22, 2018

This comment has been minimized.
Sign in to view

GuillaumeGomez force-pushed the index-size-reduction branch from bf4a984 to a4e6248Compare December 24, 2018 16:26

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

GuillaumeGomez force-pushed the index-size-reduction branch from 8d070ba to 7105a16Compare January 15, 2019 13:55

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 Jan 15, 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 Jan 15, 2019

GuillaumeGomez added 3 commits January 17, 2019 01:41

Reduce search-index.js size
f42407f

Minify search-index in one pass
2e8fd44

End fixing search index minification
d405606

bors mentioned this pull request Jan 17, 2019
Update parking_lot to 0.7 #57051
Merged

GuillaumeGomez mentioned this pull request Jan 19, 2019
Minification makes JS parsing slower #57754
Closed

kennytm mentioned this pull request Feb 5, 2019
"died due to signal 11" in collectionstests on arm-android #55861
Closed

Uh oh!

Uh oh!

Conversation

GuillaumeGomez commented Dec 16, 2018

Uh oh!

QuietMisdreavus left a comment

Choose a reason for hiding this comment

Uh oh!

QuietMisdreavus commented Dec 19, 2018

Uh oh!

bors commented Dec 19, 2018

Uh oh!

This comment has been minimized.

This comment has been minimized.

GuillaumeGomez commented Dec 24, 2018

Uh oh!

bors commented Dec 24, 2018

Uh oh!

bors commented Dec 24, 2018

Uh oh!

GuillaumeGomez commented Jan 15, 2019

Uh oh!

QuietMisdreavus commented Jan 15, 2019

Uh oh!

GuillaumeGomez commented Jan 15, 2019

Uh oh!

GuillaumeGomez commented Jan 15, 2019

Uh oh!

bors commented Jan 15, 2019

Uh oh!

bors commented Jan 15, 2019

Uh oh!

bors commented Jan 15, 2019

Uh oh!

QuietMisdreavus commented Jan 15, 2019

Uh oh!

GuillaumeGomez commented Jan 15, 2019

Uh oh!

GuillaumeGomez commented Jan 16, 2019

Uh oh!

bors commented Jan 16, 2019

Uh oh!

GuillaumeGomez commented Jan 16, 2019

Uh oh!

bors commented Jan 16, 2019

Uh oh!

bors commented Jan 16, 2019

Uh oh!

GuillaumeGomez commented Jan 17, 2019

Uh oh!

bors commented Jan 17, 2019

Uh oh!

bors commented Jan 17, 2019

Uh oh!

bors commented Jan 17, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants