corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servo: Merge #8757 - Use skia and deps from crates.io (from servo:skia); r=mbrubeck

Browse Source 
This makes the initial download for skia go from a 300 MB git repository to a 5 MB tarball. This should help with issues like #6132 and #7687.

Fix https://github.com/servo/skia/issues/70

This builds, but the at the moment causes a number of tidy errors for duplicated crates.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8b95d7b8d860ec4c0834192083361a9fb78ddbeb
This commit is contained in:
Simon Sapin
2015-12-03 12:28:29 +05:00
parent 66e5569c7b
commit dac4e7f3cc
26 changed files with 805 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
servo/python/tidy.py
View File

@@ -48,6 +48,8 @@ ignored_files = [
def should_check(file_name):
if os.path.basename(file_name) == "Cargo.lock":
return True
if ".#" in file_name:
return False
if os.path.splitext(file_name)[1] not in filetypes_to_check:
@@ -181,12 +183,12 @@ def check_lock(file_name, contents):
packages[name] = (version, idx + 1, base_name)
elif all([packages[name][0] != version, name not in exceptions, base_name not in exceptions]):
line = idx + 1
version_1 = tuple(map(int, packages[name][0].split('.')))
version_2 = tuple(map(int, version.split('.')))
version_1 = tuple(map(maybe_int, packages[name][0].split('.')))
version_2 = tuple(map(maybe_int, version.split('.')))
if version_1 < version_2: # get the line & base package containing the older version
packages[name], (version, line, base_name) = (version, line, base_name), packages[name]
message = 'conflicting versions for package "%s"' % name
message = 'duplicate versions for package "%s"' % name
error = '\n\t\033[93mexpected maximum version "{}"\033[0m'.format(packages[name][0]) + \
'\n\t\033[91mbut, "{}" demands "{}"\033[0m' \
.format(base_name, version)
@@ -198,6 +200,13 @@ def check_lock(file_name, contents):
idx += 1
def maybe_int(value):
try:
return int(value)
except ValueError:
return value
def check_toml(file_name, contents):
if not file_name.endswith(".toml"):
raise StopIteration