Skip to content

Update dependencies and Rust that's used#1885

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-deps
Aug 17, 2015
Merged

Update dependencies and Rust that's used#1885
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-deps

Conversation

@alexcrichton

Copy link
Copy Markdown
Member
  • Picks up a few breaking changes to dependency APIs, notably the tar-rs changes
    and git2-rs changes.
  • Builds should now work with VS 2015

@rust-highfive

Copy link
Copy Markdown

r? @wycats

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton

Copy link
Copy Markdown
Member Author

r? @huonw

@rust-highfive rust-highfive assigned huonw and unassigned wycats Aug 10, 2015
Comment thread src/cargo/sources/git/utils.rs Outdated

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.

This is kinda strange, could you add a comment?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Good idea, comment added!

@huonw

huonw commented Aug 10, 2015

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Aug 10, 2015

Copy link
Copy Markdown
Contributor

📌 Commit 3253218 has been approved by huonw

@bors

bors commented Aug 10, 2015

Copy link
Copy Markdown
Contributor

⌛ Testing commit 3253218 with merge 60b1f2d...

@bors

bors commented Aug 10, 2015

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-win-msvc-32

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=huonw

@bors

bors commented Aug 11, 2015

Copy link
Copy Markdown
Contributor

📌 Commit 02b0b8c has been approved by huonw

@bors

bors commented Aug 11, 2015

Copy link
Copy Markdown
Contributor

⌛ Testing commit 02b0b8c with merge b1ced5d...

@bors

bors commented Aug 11, 2015

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-win-msvc-32

@bors

bors commented Aug 13, 2015

Copy link
Copy Markdown
Contributor

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

@alexcrichton alexcrichton force-pushed the update-deps branch 4 times, most recently from bb3d152 to 78fe4a7 Compare August 13, 2015 23:10
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r+ 78fe4a7

@bors

bors commented Aug 13, 2015

Copy link
Copy Markdown
Contributor

⌛ Testing commit 78fe4a7 with merge 0c2fd15...

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r+ b62632c

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: force

@bors

bors commented Aug 13, 2015

Copy link
Copy Markdown
Contributor

⌛ Testing commit b62632c with merge feacdb6...

@bors

bors commented Aug 13, 2015

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-mac-64

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=huonw dd8374b

@bors

bors commented Aug 13, 2015

Copy link
Copy Markdown
Contributor

⌛ Testing commit dd8374b with merge f381a00...

@bors

bors commented Aug 13, 2015

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-mac-64

@alexcrichton alexcrichton force-pushed the update-deps branch 4 times, most recently from fd14ea6 to a3fefeb Compare August 14, 2015 03:36
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r+ a3fefeb

@bors

bors commented Aug 14, 2015

Copy link
Copy Markdown
Contributor

⌛ Testing commit a3fefeb with merge 606bb69...

@bors

bors commented Aug 14, 2015

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-win-gnu-32

@alexcrichton alexcrichton force-pushed the update-deps branch 2 times, most recently from 442bc70 to e89eee9 Compare August 14, 2015 05:32
* Picks up a few breaking changes to dependency APIs, notably the tar-rs changes
  and git2-rs changes.
* Builds should now work with VS 2015
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r+ 530e1d1

@bors

bors commented Aug 14, 2015

Copy link
Copy Markdown
Contributor

⌛ Testing commit 530e1d1 with merge dd3f0a7...

bors added a commit that referenced this pull request Aug 14, 2015
* Picks up a few breaking changes to dependency APIs, notably the tar-rs changes
  and git2-rs changes.
* Builds should now work with VS 2015
@bors

bors commented Aug 14, 2015

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-win-gnu-32

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: retry

@bors

bors commented Aug 17, 2015

Copy link
Copy Markdown
Contributor

⚡ Previous build results for cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-win-msvc-32, cargo-win-msvc-64 are reusable. Rebuilding only cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64...

@bors

bors commented Aug 17, 2015

Copy link
Copy Markdown
Contributor

@bors bors merged commit 530e1d1 into rust-lang:master Aug 17, 2015
@bors bors mentioned this pull request Aug 17, 2015
2 tasks
@alexcrichton alexcrichton deleted the update-deps branch August 17, 2015 04:47
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.

5 participants