Skip to content

Commit

Permalink
Fix issue with bitflags version dependency in main Cargo.toml
Browse files Browse the repository at this point in the history
  • Loading branch information
@hawkw
hawkw committed Jan 12, 2016
1 parent b90cdc7 commit 8ba0f3e
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions Cargo.toml
View file
Expand Up @@ -12,7 +12,9 @@ crate-type = ["staticlib"]

[dependencies]
rlibc = "0.1.4"
spin = "0.3.4"

[dependencies.spin]
version = "0.3.4"

[dependencies.sos_alloc]
path = "lib/sos_alloc"
Expand All @@ -27,7 +29,8 @@ features = ["system_term"]

[dependencies.bitflags]
git = "https://github.com/phil-opp/bitflags.git"
branch = "no_std"
rev = "86fd8e7081ba667c34af8a81f449b21542d3f1a0"
# branch = "no_std"

# [build-dependencies]
# nasm-rs = "^0.0.3"

6 comments on commit 8ba0f3e

@phil-opp
Copy link

Choose a reason for hiding this comment

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

There is also bitflags-core now!

@hawkw
Copy link
Member Author

@hawkw hawkw commented on 8ba0f3e Jan 12, 2016

Choose a reason for hiding this comment

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

Thanks, I switched to that crate in a8dca8b.

I'd like to change my build process so that I'm getting libcore from your phil-opp/nightly-libcore repo rather than from emk/rust@e064738, so that my build process is no longer tied to a specific Rust nightly build and I can build against the latest Rust nightlies; I just haven't gotten around to it yet.

@phil-opp
Copy link

Choose a reason for hiding this comment

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

Awesome, let me know how it works out!

@phil-opp
Copy link

Choose a reason for hiding this comment

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

I just learned that the official bitflags has a no_std feature now: bitflags/bitflags#29

@hawkw
Copy link
Member Author

@hawkw hawkw commented on 8ba0f3e Jan 12, 2016

Choose a reason for hiding this comment

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

Good to know! It looks like the official bitflag crate is up-to-date with the current nightly though, and thus doesn't enable the no_std feature gate. Right now it won't work for me yet 'cause my build process is still locked in to an older version of Rust.

I'm actually having some problems switching over to your nightly-libcore crate, but I'll open an issue for them on your repo for the crate.

@hawkw
Copy link
Member Author

@hawkw hawkw commented on 8ba0f3e Jan 13, 2016

Choose a reason for hiding this comment

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

Okay, I opened an issue (phil-opp/nightly-libcore#3) for the problem I'm having with your version of libcore. Any time you can check it out, I'd really appreciate that. No rush, of course.

Please sign in to comment.