0682ad0eb9
Changes: - Refactor move mode computation - Removes move mode arguments, unary move, capture clauses (though they still parse for backwards compatibility) - Simplify how moves are handled in trans - Fix a number of illegal copies that cropped up - Workaround for bug involving def-ids in params (see details below) Future work (I'll open bugs for these...): - Improve error messages for moves that are due to bindings - Add support for moving owned content like a.b.c to borrow check, test in trans (but I think it'll "just work") - Proper fix for def-ids in params Def ids in params: Move captures into a map instead of recomputing. This is a workaround for a larger bug having to do with the def-ids associated with ty_params, which are not always properly preserved when inlining. I am not sure of my preferred fix for the larger bug yet. This current fix removes the only code in trans that I know of which relies on ty_param def-ids, but feels fragile.
85 lines
2.5 KiB
Python
85 lines
2.5 KiB
Python
#!/usr/bin/env python
|
|
# xfail-license
|
|
|
|
import sys, fileinput, subprocess, re
|
|
from licenseck import *
|
|
|
|
err=0
|
|
cols=78
|
|
|
|
# Be careful to support Python 2.4, 2.6, and 3.x here!
|
|
config_proc=subprocess.Popen([ "git", "config", "core.autocrlf" ],
|
|
stdout=subprocess.PIPE)
|
|
result=config_proc.communicate()[0]
|
|
|
|
true="true".encode('utf8')
|
|
autocrlf=result.strip() == true if result is not None else False
|
|
|
|
def report_error_name_no(name, no, s):
|
|
global err
|
|
print("%s:%d: %s" % (name, no, s))
|
|
err=1
|
|
|
|
def report_err(s):
|
|
report_error_name_no(fileinput.filename(), fileinput.filelineno(), s)
|
|
|
|
def report_warn(s):
|
|
print("%s:%d: %s" % (fileinput.filename(),
|
|
fileinput.filelineno(),
|
|
s))
|
|
|
|
def do_license_check(name, contents):
|
|
if not check_license(name, contents):
|
|
report_error_name_no(name, 1, "incorrect license")
|
|
|
|
|
|
file_names = [s for s in sys.argv[1:] if (not s.endswith("_gen.rs"))
|
|
and (not ".#" in s)]
|
|
|
|
current_name = ""
|
|
current_contents = ""
|
|
|
|
try:
|
|
for line in fileinput.input(file_names,
|
|
openhook=fileinput.hook_encoded("utf-8")):
|
|
|
|
if fileinput.filename().find("tidy.py") == -1:
|
|
if line.find("FIXME") != -1:
|
|
if re.search("FIXME.*#\d+", line) == None:
|
|
report_err("FIXME without issue number")
|
|
if line.find("TODO") != -1:
|
|
report_err("TODO is deprecated; use FIXME")
|
|
idx = line.find("// NOTE")
|
|
if idx != -1:
|
|
report_warn("NOTE" + line[idx + len("// NOTE"):])
|
|
if (line.find('\t') != -1 and
|
|
fileinput.filename().find("Makefile") == -1):
|
|
report_err("tab character")
|
|
if not autocrlf and line.find('\r') != -1:
|
|
report_err("CR character")
|
|
if line.endswith(" \n") or line.endswith("\t\n"):
|
|
report_err("trailing whitespace")
|
|
line_len = len(line)-2 if autocrlf else len(line)-1
|
|
|
|
if line_len > cols:
|
|
report_err("line longer than %d chars" % cols)
|
|
|
|
if fileinput.isfirstline() and current_name != "":
|
|
do_license_check(current_name, current_contents)
|
|
|
|
if fileinput.isfirstline():
|
|
current_name = fileinput.filename()
|
|
current_contents = ""
|
|
|
|
current_contents += line
|
|
|
|
if current_name != "":
|
|
do_license_check(current_name, current_contents)
|
|
|
|
except UnicodeDecodeError, e:
|
|
report_err("UTF-8 decoding error " + str(e))
|
|
|
|
|
|
sys.exit(err)
|
|
|