Skip to content

Add --travis flag and fix build on nightly rust #505

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

Merged
merged 6 commits into from
Sep 4, 2014
Merged

Add --travis flag and fix build on nightly rust #505

merged 6 commits into from
Sep 4, 2014

Conversation

suhr
Copy link
Contributor

@suhr suhr commented Sep 3, 2014

This implements #489 and fast-fixes #504.

PS: why &* thing is now explicit? This change is rather surprising for me.

@alexcrichton
Copy link
Member

Can you add a test for the --travis flag as well?

@suhr
Copy link
Contributor Author

suhr commented Sep 3, 2014

I think so (didn't expect that such simple thing actually need a test).

@alexcrichton
Copy link
Member

How come this updated Cargo.lock? The update for git2 shouldn't happen just yet.

@suhr
Copy link
Contributor Author

suhr commented Sep 3, 2014

rust-encoding should be updated because it had the same build problem.

@alexcrichton
Copy link
Member

Could you run cargo update encoding just to update that one dependency? (also needs a rebase)

@suhr
Copy link
Contributor Author

suhr commented Sep 4, 2014

also needs a rebase

Umm... I'm not much familiar with git history rewriting magic.

@alexcrichton
Copy link
Member

No worries! You'll probably want to do something like:

$ git fetch origin
$ git rebase origin/master
... fix rebase conflicts, followed by `git rebase --continue`
$ git push -f

@suhr
Copy link
Contributor Author

suhr commented Sep 4, 2014

I couldn't handle all the git-rebase power, so I fixed everything dirty mercurial way. I hope, this is fine too.

bors added a commit that referenced this pull request Sep 4, 2014
This implements #489 and fast-fixes #504.

PS: why &* thing is now explicit? This change is rather surprising for me.
@alexcrichton alexcrichton mentioned this pull request Sep 4, 2014
@bors bors merged commit cc9ed63 into rust-lang:master Sep 4, 2014
@alexcrichton
Copy link
Member

And for future info @suhr, this breakage with rust master was introduced in rust-lang/rust#16917 where Box<Trait> no longer coerces to &Trait

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.

Fresh clone of cargo fails to build
3 participants