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

Less minification #66828

Merged
merged 4 commits into from
Dec 5, 2019
Merged

Less minification #66828

merged 4 commits into from
Dec 5, 2019

Conversation

GuillaumeGomez
Copy link
Member

The goal of this PR is to remove the minification process on the search-index.js file. It provides great result in term of space reduction but the computation time is far too long. I'll work on this issue and will put it back once it's fast enough.

cc @nox @lqd
r? @kinnison

@hdhoang hdhoang added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools labels Nov 28, 2019
@kinnison
Copy link
Contributor

Code looks reasonable, still seems functional.

@bors r+

@bors
Copy link
Contributor

bors commented Nov 30, 2019

📌 Commit baeea4e has been approved by kinnison

@bors
Copy link
Contributor

bors commented Nov 30, 2019

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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 30, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 1, 2019
…=kinnison

Less minification

The goal of this PR is to remove the minification process on the `search-index.js` file. It provides great result in term of space reduction but the computation time is far too long. I'll work on this issue and will put it back once it's fast enough.

cc @nox @lqd
r? @kinnison
bors added a commit that referenced this pull request Dec 1, 2019
Rollup of 7 pull requests

Successful merges:

 - #66346 (Replace .unwrap() with ? in std::os::unix::net)
 - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.)
 - #66822 (libunwind_panic: adjust miri panic hack)
 - #66827 (handle diverging functions forwarding their return place)
 - #66828 (Less minification)
 - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.)
 - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.)

Failed merges:

 - #66874 (Miri engine: proper support for `Assert` MIR terminators)

r? @ghost
bors added a commit that referenced this pull request Dec 1, 2019
Rollup of 7 pull requests

Successful merges:

 - #66346 (Replace .unwrap() with ? in std::os::unix::net)
 - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.)
 - #66822 (libunwind_panic: adjust miri panic hack)
 - #66827 (handle diverging functions forwarding their return place)
 - #66828 (Less minification)
 - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.)
 - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.)

Failed merges:

 - #66874 (Miri engine: proper support for `Assert` MIR terminators)

r? @ghost
@dtolnay
Copy link
Member

dtolnay commented Dec 2, 2019

@bors r-

Could this be causing the failure in #66924 (comment) ?

2019-12-01T22:56:31.7592320Z [TIMING] DocTest { compiler: Compiler { stage: 2, host: "i686-apple-darwin" }, path: "src/doc/rustc", name: "rustc", is_ext_doc: false } -- 4.045
2019-12-01T22:56:32.5534600Z tmp.js:2
2019-12-01T22:56:32.5538260Z searchIndex["alloc"] = {"doc":"The Rust core allocation and collections library","i":[[0,"alloc","alloc","Memory allocation APIs",null,null],[3,"Excess","alloc::alloc","Represents the combination of a starting address and a…",null,null],[12,"0","","",0,null],[12,"1","","",0,null],[3,"Layout","","Layout of a block of memory.",null,null],[3,"LayoutErr","","The parameters given to `Layout::from_size_align` or some…",null,null],[3,"AllocErr","","The `AllocErr` error indicates an allocation failure that…",null,null],[3,"CannotReallocInPlace","","The `CannotReallocInPlace` error is used when…",null,null],[8,"GlobalAlloc","","A memory allocator that can be registered as the standard…",null,null],[10,"alloc","","Allocate memory as described by the given `layout`.",1,[[["self"],["layout"]]]],[10,"dealloc","","Deallocate the block of memory at the given `ptr` pointer…",1,[[["self"],["layout"]]]],[11,"alloc_zeroed","","Behaves like `alloc`, but also ensures that the contents…",1,[[["self"],["lay
2019-12-01T22:56:32.5538820Z 
2019-12-01T22:56:32.5539000Z ReferenceError: addSearchOptions is not defined
2019-12-01T22:56:32.5539090Z     at Object.<anonymous> (tmp.js:2:161112)
2019-12-01T22:56:32.5539200Z     at Module._compile (module.js:577:32)
2019-12-01T22:56:32.5540050Z     at loadContent (/Users/runner/runners/2.160.1/work/1/s/src/tools/rustdoc-js-std/tester.js:166:7)
2019-12-01T22:56:32.5540930Z     at main (/Users/runner/runners/2.160.1/work/1/s/src/tools/rustdoc-js-std/tester.js:264:19)
2019-12-01T22:56:32.5541730Z     at Object.<anonymous> (/Users/runner/runners/2.160.1/work/1/s/src/tools/rustdoc-js-std/tester.js:344:14)
2019-12-01T22:56:32.5541860Z     at Module._compile (module.js:577:32)
2019-12-01T22:56:32.5542000Z     at Object.Module._extensions..js (module.js:586:10)
2019-12-01T22:56:32.5542190Z     at Module.load (module.js:494:32)
2019-12-01T22:56:32.5542290Z     at tryModuleLoad (module.js:453:12)
2019-12-01T22:56:32.5542390Z     at Function.Module._load (module.js:445:3)
2019-12-01T22:56:32.5583130Z 
2019-12-01T22:56:32.5583130Z 
2019-12-01T22:56:32.5584280Z command did not execute successfully: "/usr/local/bin/node" "src/tools/rustdoc-js-std/tester.js" "i686-apple-darwin"
2019-12-01T22:56:32.5584570Z 
2019-12-01T22:56:32.5584610Z 
2019-12-01T22:56:32.5596610Z failed to run: /Users/runner/runners/2.160.1/work/1/s/build/bootstrap/debug/bootstrap test
2019-12-01T22:56:32.5596800Z Build completed unsuccessfully in 1:39:04

FYI @Centril

@bors 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 2, 2019
@GuillaumeGomez
Copy link
Member Author

Fixed the issue: forgot to add a backline before adding some JS calls at the end of the search-index.js file.

@GuillaumeGomez
Copy link
Member Author

Let's try again!

@bors: r=kinnison

@bors
Copy link
Contributor

bors commented Dec 2, 2019

📌 Commit 2d0f0ca has been approved by kinnison

@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 Dec 2, 2019
@bors
Copy link
Contributor

bors commented Dec 5, 2019

⌛ Testing commit 2d0f0ca with merge d4622483b95fd3df7ecb3c0610d068bdbf78cb83...

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Dec 5, 2019
…=kinnison

Less minification

The goal of this PR is to remove the minification process on the `search-index.js` file. It provides great result in term of space reduction but the computation time is far too long. I'll work on this issue and will put it back once it's fast enough.

cc @nox @lqd
r? @kinnison
@JohnTitor
Copy link
Member

@bors retry rolled up

@bors
Copy link
Contributor

bors commented Dec 5, 2019

⌛ Testing commit 2d0f0ca with merge 710a362...

bors added a commit that referenced this pull request Dec 5, 2019
Less minification

The goal of this PR is to remove the minification process on the `search-index.js` file. It provides great result in term of space reduction but the computation time is far too long. I'll work on this issue and will put it back once it's fast enough.

cc @nox @lqd
r? @kinnison
@bors
Copy link
Contributor

bors commented Dec 5, 2019

☀️ Test successful - checks-azure
Approved by: kinnison
Pushing 710a362 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 5, 2019
@bors bors merged commit 2d0f0ca into rust-lang:master Dec 5, 2019
@GuillaumeGomez GuillaumeGomez deleted the less-minification branch December 5, 2019 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools merged-by-bors This PR was explicitly merged by bors. 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.

None yet

7 participants