Upgrade to latest Rust

[Manishearth]

I'm not entirely sure if this is correctly done. I had merge conflicts here, needs a closer look

(@glennw, could you help here? Thanks)

[glennw]

Looks correct to me.

[metajack]

Shouldn't this be submitted upstream to sfackler/rust-phf?

[glennw]

This is just pulling in upstream updates and undoing changes we had for our (older) compiler version AFAIK.

[metajack]

Ok. Usually you merge these after review. Do you not have a green button?

[glennw]

I thought it was the PR author who merged submodules after review. Merging now.

[Manishearth]

(note that there were merge conflicts, so its not entirely an upstream pull)

-----Original Message-----
From: "Jack Moffitt" notifications@github.com
Sent: ‎6/‎20/‎2014 3:32 AM
To: "mozilla-servo/rust-phf" rust-phf@noreply.github.com
Cc: "Manish Goregaokar" manishsmail@gmail.com
Subject: Re: [rust-phf] Upgrade to latest Rust (#2)

Ok. Usually you merge these after review. Do you not have a green button?
—
Reply to this email directly or view it on GitHub.

[Manishearth]

I don't have access to this repo, iirc. (this and a couple other mozilla-servo repos)

-----Original Message-----
From: "glennw" notifications@github.com
Sent: ‎6/‎20/‎2014 3:36 AM
To: "mozilla-servo/rust-phf" rust-phf@noreply.github.com
Cc: "Manish Goregaokar" manishsmail@gmail.com
Subject: Re: [rust-phf] Upgrade to latest Rust (#2)

I thought it was the PR author who merged submodules after review. Merging now.
—
Reply to this email directly or view it on GitHub.