Update minifier-rs version#62392

GuillaumeGomez · 2019-07-04T22:31:58Z

The main.js file size goes from 52868 to 50134. A few fixes have been included as well (no more eluded parts of js files).

r? @QuietMisdreavus

bors · 2019-07-06T21:55:14Z

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

fmckeogh · 2019-07-23T06:44:17Z

@GuillaumeGomez @QuietMisdreavus Ping from triage regarding the merge conflicts and review! :)

GuillaumeGomez · 2019-07-23T10:56:40Z

Updated.

r? @ollie27

GuillaumeGomez · 2019-07-25T14:11:10Z

Considering this is a small bugfix and that it's been open for weeks, I'll just r+ it (I really hate doing it for my own PRs)...

@bors: r+

bors · 2019-07-25T14:11:11Z

📌 Commit 0bf81d3 has been approved by GuillaumeGomez

@QuietMisdreavus

…uillaumeGomez Update minifier-rs version The `main.js` file size goes from 52868 to 50134. A few fixes have been included as well (no more eluded parts of js files). r? @QuietMisdreavus

bors · 2019-07-27T05:01:38Z

🔒 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 update-minifier (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 update-minifier --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/render.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

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

@bors: r+ p=1

bors · 2019-07-27T12:11:05Z

📌 Commit 87d8386ec7ea9e7bbcd0875f705e6cb11d3b9fc6 has been approved by GuillaumeGomez

bors · 2019-07-28T04:57:37Z

🔒 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 update-minifier (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 update-minifier --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 Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3298 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.

GuillaumeGomez · 2019-07-28T12:06:15Z

@bors: r+ p=1

bors · 2019-07-28T12:06:17Z

📌 Commit 69931365d4c1e02c51c6662782bb4146696912c5 has been approved by GuillaumeGomez

bors · 2019-07-28T12:50:28Z

🔒 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 update-minifier (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 update-minifier --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 Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

GuillaumeGomez · 2019-07-28T18:26:32Z

@bors: r+ p=1

bors · 2019-07-28T18:26:33Z

📌 Commit 3f4dbd3 has been approved by GuillaumeGomez

@QuietMisdreavus

…uillaumeGomez Update minifier-rs version The `main.js` file size goes from 52868 to 50134. A few fixes have been included as well (no more eluded parts of js files). r? @QuietMisdreavus

@ghost

Rollup of 8 pull requests Successful merges: - #61856 (Lint attributes on function arguments) - #62360 (Document that ManuallyDrop::drop should not called more than once) - #62392 (Update minifier-rs version) - #62871 (Explicit error message for async recursion.) - #62995 (Avoid ICE when suggestion span is at Eof) - #63053 (SystemTime docs: recommend Instant for elapsed time) - #63081 (tidy: Cleanup the directory whitelist) - #63088 (Remove anonymous_parameters from unrelated test) Failed merges: r? @ghost

bors · 2019-07-29T00:08:37Z

⌛ Testing commit 3f4dbd3 with merge c7312fe...

rust-highfive assigned QuietMisdreavus Jul 4, 2019

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 6, 2019

GuillaumeGomez force-pushed the update-minifier branch from dd565d3 to 0bf81d3 Compare July 23, 2019 10:56

rust-highfive assigned ollie27 and unassigned QuietMisdreavus Jul 23, 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 Jul 25, 2019

Mark-Simulacrum mentioned this pull request Jul 27, 2019

Rollup of 5 pull requests #63030

Closed

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 Jul 27, 2019

GuillaumeGomez force-pushed the update-minifier branch from 0bf81d3 to 87d8386 Compare July 27, 2019 12:10

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 Jul 27, 2019

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 Jul 28, 2019

GuillaumeGomez force-pushed the update-minifier branch from 87d8386 to 6993136 Compare July 28, 2019 12:05

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 28, 2019

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 28, 2019

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 Jul 28, 2019

Update minifier-rs version

3f4dbd3

GuillaumeGomez force-pushed the update-minifier branch from 6993136 to 3f4dbd3 Compare July 28, 2019 18: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 Jul 28, 2019

Centril mentioned this pull request Jul 28, 2019

Rollup of 8 pull requests #63090

Merged

bors merged commit 3f4dbd3 into rust-lang:master Jul 29, 2019

GuillaumeGomez deleted the update-minifier branch July 29, 2019 08:41

Uh oh!

Conversation

GuillaumeGomez commented Jul 4, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Jul 6, 2019

Uh oh!

fmckeogh commented Jul 23, 2019

Uh oh!

GuillaumeGomez commented Jul 23, 2019

Uh oh!

GuillaumeGomez commented Jul 25, 2019

Uh oh!

bors commented Jul 25, 2019

Uh oh!

bors commented Jul 27, 2019

Uh oh!

GuillaumeGomez commented Jul 27, 2019

Uh oh!

bors commented Jul 27, 2019

Uh oh!

bors commented Jul 28, 2019

Uh oh!

GuillaumeGomez commented Jul 28, 2019

Uh oh!

bors commented Jul 28, 2019

Uh oh!

bors commented Jul 28, 2019

Uh oh!

GuillaumeGomez commented Jul 28, 2019

Uh oh!

bors commented Jul 28, 2019

Uh oh!

bors commented Jul 29, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

GuillaumeGomez commented Jul 4, 2019 •

edited

Loading