servo: Merge #7697 - Rust upgrade to rustc 1.5.0-dev (6217b002b 2015-09-21) (from servo:rustup_20150921); r=Ms2ger

Snapshot doesn't exist yet. Rust master+ should work.

Also https://github.com/serde-rs/aster/pull/33 hasn't merged yet.

r? @Ms2ger @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: f7f16870bebdc9359661544054259b37780f1331
This commit is contained in:
Manish Goregaokar
2015-09-23 06:45:18 -06:00
parent f96adb1667
commit 3e8738a6e4
40 changed files with 253 additions and 253 deletions

View File

@@ -48,7 +48,7 @@ path = "../plugins"
bitflags = "0.3"
rustc-serialize = "0.3.4"
euclid = "0.2"
serde = "0.5"
serde = "0.6"
serde_macros = "0.5"
[target.x86_64-apple-darwin.dependencies]