Skip to content

Merge rustup's crates#1704

Merged
kinnison merged 6 commits into
rust-lang:masterfrom
dwijnand:merge-crates
Mar 15, 2019
Merged

Merge rustup's crates#1704
kinnison merged 6 commits into
rust-lang:masterfrom
dwijnand:merge-crates

Conversation

@dwijnand

Copy link
Copy Markdown
Contributor

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

bors commented Mar 12, 2019

Copy link
Copy Markdown
Contributor

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

@dwijnand

Copy link
Copy Markdown
Contributor 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 left a comment

Copy link
Copy Markdown
Contributor

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 👍

Comment thread ci/run.sh
Comment thread tests/cli-exact.rs
@bors

bors commented Mar 14, 2019

Copy link
Copy Markdown
Contributor

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

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.

3 participants