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

Upgrade Rust #5

Merged
merged 33 commits into from Jul 31, 2014
Merged

Upgrade Rust #5

merged 33 commits into from Jul 31, 2014

Conversation

@metajack
Copy link

metajack commented Jul 31, 2014

Merge upstream, fixed makefile, and backport a few fixes.

alexcrichton and others added 30 commits Jun 25, 2014
We don't actually support anything beyond &'static str right now, but
this will allow other keys in the future.
Update Cargo.toml to the new `plugin = true` flag
This implements @glennw's PR #5 to move the hashing code used by both
phf and phf_mac into a module imported by both crates. It breaks the
hard dependency of phf_mac on phf, which means phf doesn't have to be
compiled for the host architecture as well as the target. It also means
we can have a dev-dependency from phf to phf_mac for tests.
SimonSapin added a commit that referenced this pull request Jul 31, 2014
@SimonSapin SimonSapin merged commit 44d9804 into servo Jul 31, 2014
@SimonSapin SimonSapin deleted the rustup-20140716 branch Jul 31, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.