Skip to content

Conversation

@TheDarkula
Copy link
Contributor

@RalfJung
Copy link
Member

That looks exactly right, thanks! However, it seems you worked on an older version of master; GitHub says there are merge conflicts. (And nothing has landed in the last 1h so these conflicts were present already when you opened the PR.)

Can you resolve those conflicts?

@RalfJung
Copy link
Member

Thanks!

Now we just have to wait for a nightly to happen.

@TheDarkula
Copy link
Contributor Author

Ah. I was wondering why the builds were still failing :)

@RalfJung
Copy link
Member

Now that we got a nightly, please update the rust-toolchain file to nightly-2018-08-32. Then CI should become green.

@RalfJung
Copy link
Member

RalfJung commented Sep 1, 2018

Eh, sorry, I had a typo there. There was no nightly on August 32snd.^^

Let me land the other PR first to make CI green again...

@RalfJung
Copy link
Member

RalfJung commented Sep 1, 2018

I resolved that conflict for you. Once CI is green, we can land this :)

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.

2 participants