Skip to content
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

Fixes for rust nightly change to behavior of no_std #1

Merged
merged 1 commit into from
Aug 16, 2015

Conversation

mokus0
Copy link

@mokus0 mokus0 commented Aug 16, 2015

As described at rust-lang/rfcs#1184, new rust nightlies automatically import core when no_std is active

farcaller added a commit that referenced this pull request Aug 16, 2015
Fixes for rust nightly change to behavior of no_std
@farcaller farcaller merged commit 1814ee0 into hackndev:zinc Aug 16, 2015
@mcoffin
Copy link

mcoffin commented Aug 17, 2015

FYI this is going to clash with alexcrichton@ba9a502 from upstream. We should probably have just rebased instead.

If we want mcoffin/rlibc/zinc has a rebased version of the zinc branch we could use. I guess the debate is between managing a merge-based fork or rebasing on upstream updates. Since our updates at the moment are so minimal, I'm sort-of in favor of the latter. @farcaller ?

@mokus0
Copy link
Author

mokus0 commented Aug 17, 2015

Shoot, I should've thought to check for pre-existing fixes. Sorry, I'm only just starting to dabble in rust and I didn't realize this was a branch of an "official" lib.

@mcoffin
Copy link

mcoffin commented Aug 17, 2015

Well the good news is your diff is literally identical down to spacing and everything, so good job on the style!

@mokus0 mokus0 deleted the nightly-updates branch August 17, 2015 01:53
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