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

Revert "Don't generate minification variable if minification disabled" #59158

Merged
merged 1 commit into from
Mar 16, 2019

Conversation

Manishearth
Copy link
Member

Reverts #58643

Fixes #59157

#58643 made us stop generating minification variables when minification is disabled, however they may still be needed for parent crates that were generated with minification (this will always be the case for libstd and libcore)

r? @QuietMisdreavus @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 13, 2019
@SimonSapin
Copy link
Contributor

Note a possibly-unusual detail of https://doc.servo.org/: we copy the files of rustup’s rust-docs components into target/doc/ before running cargo doc. That way, standard library types in e.g. the signature of a Servo function link to a local copy of the standard library’s docs. We do this because the version of Rust Nightly that we specify in rust-toolchain is typically not the same as https://doc.rust-lang.org/nightly/ on any given day.

@Manishearth
Copy link
Member Author

I think this is still a bug because you should be able to build some crates with minification disabled, rustdoc fundamentally builds on the search index.

@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Mar 13, 2019

Strange... I think it's a good fix meanwhile so let's get it in! I'll look why we use N afterwards.

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 13, 2019

📌 Commit c37dab7 has been approved by GuillaumeGomez

@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 Mar 13, 2019
@bors
Copy link
Contributor

bors commented Mar 13, 2019

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Mar 13, 2019

📌 Commit c37dab7 has been approved by GuillaumeGomez

kennytm added a commit to kennytm/rust that referenced this pull request Mar 15, 2019
…llaumeGomez

Revert "Don't generate minification variable if minification disabled"

Reverts rust-lang#58643

Fixes rust-lang#59157

rust-lang#58643 made us stop generating minification variables when minification is disabled, however they may still be needed for parent crates that were generated with minification (this will always be the case for libstd and libcore)

r? @QuietMisdreavus @GuillaumeGomez
kennytm added a commit to kennytm/rust that referenced this pull request Mar 16, 2019
…llaumeGomez

Revert "Don't generate minification variable if minification disabled"

Reverts rust-lang#58643

Fixes rust-lang#59157

rust-lang#58643 made us stop generating minification variables when minification is disabled, however they may still be needed for parent crates that were generated with minification (this will always be the case for libstd and libcore)

r? @QuietMisdreavus @GuillaumeGomez
bors added a commit that referenced this pull request Mar 16, 2019
Rollup of 37 pull requests

Successful merges:

 - #58854 (appveyor: Use VS2017 for all our images)
 - #58855 (std: Spin for a global malloc lock on wasm32)
 - #58873 (Fix "Auto-hide item methods documentation" setting)
 - #58901 (Change `std::fs::copy` to use `copyfile` on MacOS and iOS)
 - #58933 (Move alloc::prelude::* to alloc::prelude::v1, make alloc a subset of std)
 - #58938 (core: ensure VaList passes improper_ctypes lint)
 - #58941 (MIPS: add r6 support)
 - #58949 (SGX target: Expose thread id function in os module)
 - #58959 (Add release notes for PR #56243)
 - #58976 (Default to integrated `rust-lld` linker for UEFI targets)
 - #59009 (Fix SGX implementations of read/write_vectored.)
 - #59025 (Fix generic argument lookup for Self)
 - #59036 (Fix ICE in MIR pretty printing)
 - #59037 (Avoid some common false positives in intra doc link checking)
 - #59072 (we can now skip should_panic tests with the libtest harness)
 - #59079 (add suggestions to invalid macro item error)
 - #59082 (A few improvements to comments in user-facing crates)
 - #59102 (Consistent naming for duration_float methods and additional f32 methods)
 - #59118 (rustc: fix ICE when trait alias has bare Self)
 - #59139 (Unregress using scalar unions in constants.)
 - #59146 (Suggest return lifetime when there's only one named lifetime)
 - #59147 (Make std time tests more robust for platform differences)
 - #59152 (Stabilize Range*::contains.)
 - #59156 ([wg-async-await] Add regression test for #55809.)
 - #59158 (Revert "Don't generate minification variable if minification disabled")
 - #59169 (Add `-Z allow_features=...` flag)
 - #59173 (bootstrap: Default to a sensible llvm-suffix.)
 - #59175 (Don't run test launching `echo` since that doesn't exist on Windows)
 - #59180 (Use try blocks in rustc_codegen_ssa)
 - #59185 (No old chestnuts in iter::repeat docs)
 - #59201 (Remove restriction on isize/usize in repr(simd))
 - #59204 (Output diagnostic information for rustdoc)
 - #59206 (Improved test output)
 - #59208 (Reduce a Code Repetition Related to Bit Operation)
 - #59212 (Add x86_64 musl host to the manifest)
 - #59221 (Option and Result: Add references to documentation of as_ref and as_mut)
 - #59231 (Stabilize Option::copied)
@bors bors merged commit c37dab7 into rust-lang:master Mar 16, 2019
@Manishearth Manishearth deleted the fix-minification branch July 18, 2020 01:15
@Manishearth Manishearth restored the fix-minification branch July 18, 2020 01:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants