Skip to content

Upgrade Rust to build Cargo#2316

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update
Jan 25, 2016
Merged

Upgrade Rust to build Cargo#2316
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

A few small tweaks to tests were necessary to accomodate rust-lang/rust#29520,
and a few changes were made to the code to account for that as well.

@rust-highfive

Copy link
Copy Markdown

r? @huonw

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

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r+ 857778d

@bors

bors commented Jan 25, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit 857778d with merge 5cc34d1...

@bors

bors commented Jan 25, 2016

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-win-msvc-32

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.

Shouldn't this be "builder.dll" since the library is builder.dll.lib?

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.

I believe so, yes

A few small tweaks to tests were necessary to accomodate rust-lang/rust#29520,
and a few changes were made to the code to account for that as well.
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r+ 3194a23

@bors

bors commented Jan 25, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit 3194a23 with merge c1a5a47...

bors added a commit that referenced this pull request Jan 25, 2016
A few small tweaks to tests were necessary to accomodate rust-lang/rust#29520,
and a few changes were made to the code to account for that as well.
@bors

bors commented Jan 25, 2016

Copy link
Copy Markdown
Contributor

@bors bors merged commit 3194a23 into rust-lang:master Jan 25, 2016
@alexcrichton alexcrichton deleted the update branch January 25, 2016 19:24
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