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

Don't generate minification variables if minification disabled #58643

Merged
merged 1 commit into from
Feb 23, 2019

Conversation

GuillaumeGomez
Copy link
Member

If the minification is disabled, there is no sense having those variables.

r? @QuietMisdreavus

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 22, 2019
@GuillaumeGomez GuillaumeGomez changed the title Don't generate minification variable if minification disabled Don't generate minification variables if minification disabled Feb 22, 2019
@GuillaumeGomez
Copy link
Member Author

r? @Manishearth

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 22, 2019

📌 Commit b5ae4d5 has been approved by Manishearth

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

@bors: rollup

Centril added a commit to Centril/rust that referenced this pull request Feb 23, 2019
…anishearth

Don't generate minification variables if minification disabled

If the minification is disabled, there is no sense having those variables.

r? @QuietMisdreavus
Centril added a commit to Centril/rust that referenced this pull request Feb 23, 2019
…anishearth

Don't generate minification variables if minification disabled

If the minification is disabled, there is no sense having those variables.

r? @QuietMisdreavus
Centril added a commit to Centril/rust that referenced this pull request Feb 23, 2019
…anishearth

Don't generate minification variables if minification disabled

If the minification is disabled, there is no sense having those variables.

r? @QuietMisdreavus
Centril added a commit to Centril/rust that referenced this pull request Feb 23, 2019
…anishearth

Don't generate minification variables if minification disabled

If the minification is disabled, there is no sense having those variables.

r? @QuietMisdreavus
Centril added a commit to Centril/rust that referenced this pull request Feb 23, 2019
…anishearth

Don't generate minification variables if minification disabled

If the minification is disabled, there is no sense having those variables.

r? @QuietMisdreavus
bors added a commit that referenced this pull request Feb 23, 2019
Rollup of 16 pull requests

Successful merges:

 - #58100 (Transition librustdoc to Rust 2018)
 - #58122 (RangeInclusive internal iteration performance improvement.)
 - #58199 (Add better error message for partial move)
 - #58227 (Updated RELEASES.md for 1.33.0)
 - #58353 (Check the Self-type of inherent associated constants)
 - #58453 (SGX target: fix panic = abort)
 - #58476 (Remove `LazyTokenStream`.)
 - #58526 (Special suggestion for illegal unicode curly quote pairs)
 - #58595 (Turn duration consts into associated consts)
 - #58609 (Allow Self::Module to be mutated.)
 - #58628 (Optimise vec![false; N] to zero-alloc)
 - #58643 (Don't generate minification variables if minification disabled)
 - #58648 (Update tests to account for cross-platform testing and miri.)
 - #58654 (Do not underflow after resetting unmatched braces count)
 - #58658 (Add expected/provided byte alignments to validation error message)
 - #58667 (Reduce Miri-related Code Repetition `like (n << amt) >> amt`)

Failed merges:

r? @ghost
@bors bors merged commit b5ae4d5 into rust-lang:master Feb 23, 2019
@GuillaumeGomez GuillaumeGomez deleted the extra-variables branch February 23, 2019 20:09
@Manishearth
Copy link
Member

Looks like N is used elsewhere

#58849 (comment)

@Manishearth
Copy link
Member

Ah so the problem is that even if you disable minification the parent crates may not have (and std/core won't), so the variable still needs to exist.

@Manishearth
Copy link
Member

#59158

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
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.

5 participants