servo: Merge #10076 - Update to Rust 2016-03-18 (from servo:rustup); r=larsbergstrom,manishearth

Source-Repo: https://github.com/servo/servo Source-Revision: aa35d7721b0e1e7893e48af1eb91bf8ad2495d46
2016-03-20 14:06:17 +05:00
parent dd54677784
commit 49335b058c
10 changed files with 212 additions and 190 deletions
--- a/servo/python/tidy.py
+++ b/servo/python/tidy.py
@@ -204,7 +204,7 @@ def check_lock(file_name, contents):
        raise StopIteration

    # package names to be neglected (as named by cargo)
-    exceptions = []
+    exceptions = ["bitflags"]

    import toml
    content = toml.loads(contents)