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.

Sign up for GitHub

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

Jump to bottom

Merge rustup's crates #1704

Merged
merged 6 commits into from
Mar 15, 2019
Merged

Merge rustup's crates #1704

merged 6 commits into from
Mar 15, 2019

Conversation

dwijnand
Copy link
Member

Fixes #1644

@dwijnand dwijnand force-pushed the merge-crates branch 2 times, most recently from bda4b07 to efc89e1 Compare March 10, 2019 21:51
@bors
Copy link
Contributor

bors commented Mar 12, 2019

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

@dwijnand
Copy link
Member Author

@nrc / @kinnison let me know if there's anything I can do to make it easier to review this (open to suggestions). I can present this in a call, if running through it together helps (I've had success with this strategy, as both a submitter and reviewer).

kinnison
kinnison approved these changes Mar 14, 2019
View reviewed changes
Copy link
Contributor

@kinnison kinnison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty much spot on what I was expecting.

Two comments, but if they don't end up implying changes, then 👍

ci/run.sh Outdated Show resolved Hide resolved
tests/cli-exact.rs Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Mar 14, 2019

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

@kinnison kinnison merged commit 415846e into rust-lang:master Mar 15, 2019
This was referenced Mar 15, 2019
Merged
Merged
Merged
Closed
@dwijnand dwijnand deleted the merge-crates branch March 15, 2019 22:01
@rami3l rami3l mentioned this pull request Jun 8, 2024
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kinnison kinnison kinnison approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dwijnand @bors @kinnison