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

Undo whitespace tweaks pending libbacktrace merge #30687

Merged
merged 1 commit into from
Jan 12, 2016
Merged

Undo whitespace tweaks pending libbacktrace merge #30687

merged 1 commit into from
Jan 12, 2016

Conversation

mmcco
Copy link
Contributor

@mmcco mmcco commented Jan 4, 2016

These should probably be submitted upstream. They're inevitably going to
complicate merges, and because they're non-functional changes this just
isn't worth our time.

These should probably be submitted upstream. They're inevitably going to
complicate merges, and because they're non-functional changes this just
isn't worth our time.
@eddyb
Copy link
Member

eddyb commented Jan 4, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Jan 4, 2016

📌 Commit 810c035 has been approved by eddyb

@eddyb
Copy link
Member

eddyb commented Jan 4, 2016

@bors r-

Maybe we should wait on https://gcc.gnu.org/ml/gcc-patches/2016-01/msg00063.html.

@mmcco
Copy link
Contributor Author

mmcco commented Jan 4, 2016

Agreed. I'll be far from shocked if that patch is ignored or rejected, but it's worth a shot.

@carloslbello
Copy link
Contributor

Sorry to see that these changes were causing issues :(, FWIW I'm entirely okay with them being reverted.

@mmcco Thank you for sending that patch and CCing me, I've posted some additional information about it to the thread.

@mmcco
Copy link
Contributor Author

mmcco commented Jan 10, 2016

At this point, I think we should merge this PR and reapply the whitespace fixes if upstream eventually accepts them. When that happens, I'll submit a PR to pull new changes from upstream.

@eddyb
Copy link
Member

eddyb commented Jan 10, 2016

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 10, 2016

📌 Commit 810c035 has been approved by eddyb

nagisa added a commit to nagisa/rust that referenced this pull request Jan 11, 2016
These should probably be submitted upstream. They're inevitably going to
complicate merges, and because they're non-functional changes this just
isn't worth our time.
bors added a commit that referenced this pull request Jan 11, 2016
@bors bors merged commit 810c035 into rust-lang:master Jan 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants