auto merge of #11989 : adridu59/rust/tidy, r=alexcrichton

Closes #11985
Closes #4533

@huonw, @alexcrichton

src/etc/check-summary.py

@@ -1,5 +1,12 @@
-#!/usr/bin/env python
-# xfail-license
+# Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 import glob
 import sys

src/etc/combine-tests.py

@@ -1,7 +1,14 @@
-#!/usr/bin/env python
-# xfail-license
+# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
-# this combines all the working run-pass tests into a single large crate so we
+# This combines all the working run-pass tests into a single large crate so we
 # can run it "fast": spawning zillions of windows processes is our major build
 # bottleneck (and it doesn't hurt to run faster on other platforms as well).
 

src/etc/copy-runtime-deps.py

@@ -1,7 +1,14 @@
-#!/usr/bin/env python
-# xfail-license
+# Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
-# Copies Rust runtime dependencies to the specified directory
+# Copies Rust runtime dependencies to the specified directory.
 
 import snapshot, sys, os, shutil
 

src/etc/extract-tests.py

@@ -1,5 +1,13 @@
-# xfail-license
-# -*- coding: utf-8 -*-
+# Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
 """
 Script for extracting compilable fragments from markdown documentation. See
 prep.js for a description of the format recognized by this tool. Expects

src/etc/extract_grammar.py

@@ -1,5 +1,12 @@
-#!/usr/bin/env python
-# xfail-license
+# Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 # This script is for extracting the grammar from the rust docs.
 

src/etc/generate-deriving-span-tests.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# xfail-license
+#
 # Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.

src/etc/generate-keyword-tests.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# xfail-license
+#
 # Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 # file at the top-level directory of this distribution and at
 # http://rust-lang.org/COPYRIGHT.

src/etc/get-snapshot.py

@@ -1,5 +1,12 @@
-#!/usr/bin/env python
-# xfail-license
+# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 import os, tarfile, re, shutil, sys
 from snapshot import *

src/etc/latest-unix-snaps.py

@@ -1,5 +1,14 @@
 #!/usr/bin/env python
-# xfail-license
+#
+# Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 import os, tarfile, hashlib, re, shutil, sys
 from snapshot import *

src/etc/make-snapshot.py

@@ -1,5 +1,12 @@
-#!/usr/bin/env python
-# xfail-license
+# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 import snapshot, sys
 

src/etc/maketest.py

@@ -1,4 +1,12 @@
-# xfail-license
+# Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 import subprocess
 import os

src/etc/mirror-all-snapshots.py

@@ -1,5 +1,14 @@
 #!/usr/bin/env python
-# xfail-license
+#
+# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 import os, tarfile, hashlib, re, shutil
 from snapshot import *

src/etc/mklldeps.py

@@ -1,4 +1,12 @@
-# xfail-license
+# Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 import os
 import sys

src/etc/snapshot.py

@@ -1,23 +1,31 @@
-# xfail-license
+# Copyright 2011-2014 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 import re, os, sys, glob, tarfile, shutil, subprocess, tempfile, distutils.spawn
 
 try:
-  import hashlib
-  sha_func = hashlib.sha1
+    import hashlib
+    sha_func = hashlib.sha1
 except ImportError:
-  import sha
-  sha_func = sha.new
+    import sha
+    sha_func = sha.new
 
 def scrub(b):
-  if sys.version_info >= (3,) and type(b) == bytes:
-    return b.decode('ascii')
-  else:
-    return b
+    if sys.version_info >= (3,) and type(b) == bytes:
+        return b.decode('ascii')
+    else:
+        return b
 
 src_dir = scrub(os.getenv("CFG_SRC_DIR"))
 if not src_dir:
-  raise Exception("missing env var CFG_SRC_DIR")
+    raise Exception("missing env var CFG_SRC_DIR")
 
 snapshotfile = os.path.join(src_dir, "src", "snapshots.txt")
 download_url_base = "http://static.rust-lang.org/stage0-snapshots"
@@ -31,37 +39,36 @@ snapshot_files = {
     "freebsd": ["bin/rustc"],
     }
 
-winnt_runtime_deps = ["libgcc_s_dw2-1.dll",
-                      "libstdc++-6.dll"]
+winnt_runtime_deps = ["libgcc_s_dw2-1.dll", "libstdc++-6.dll"]
 
 def parse_line(n, line):
-  global snapshotfile
+    global snapshotfile
 
-  if re.match(r"\s*$", line): return None
+    if re.match(r"\s*$", line): return None
 
-  if re.match(r"^T\s*$", line): return None
+    if re.match(r"^T\s*$", line): return None
 
-  match = re.match(r"\s+([\w_-]+) ([a-fA-F\d]{40})\s*$", line)
-  if match:
-    return { "type": "file",
-             "platform": match.group(1),
-             "hash": match.group(2).lower() }
+    match = re.match(r"\s+([\w_-]+) ([a-fA-F\d]{40})\s*$", line)
+    if match:
+        return { "type": "file",
+                 "platform": match.group(1),
+                 "hash": match.group(2).lower() }
 
-  match = re.match(r"([ST]) (\d{4}-\d{2}-\d{2}) ([a-fA-F\d]+)\s*$", line);
-  if (not match):
-    raise Exception("%s:%d:E syntax error: " % (snapshotfile, n))
-  return {"type": "snapshot",
-          "date": match.group(2),
-          "rev": match.group(3)}
+    match = re.match(r"([ST]) (\d{4}-\d{2}-\d{2}) ([a-fA-F\d]+)\s*$", line);
+    if not match:
+        raise Exception("%s:%d:E syntax error: " % (snapshotfile, n))
+    return { "type": "snapshot",
+             "date": match.group(2),
+             "rev": match.group(3) }
 
 
 def partial_snapshot_name(date, rev, platform):
-  return ("rust-stage0-%s-%s-%s.tar.bz2"
-          % (date, rev, platform))
+    return ("rust-stage0-%s-%s-%s.tar.bz2"
+                    % (date, rev, platform))
 
 def full_snapshot_name(date, rev, platform, hsh):
-  return ("rust-stage0-%s-%s-%s-%s.tar.bz2"
-          % (date, rev, platform, hsh))
+    return ("rust-stage0-%s-%s-%s-%s.tar.bz2"
+                    % (date, rev, platform, hsh))
 
 
 def get_kernel(triple):
@@ -78,23 +85,22 @@ def get_kernel(triple):
 def get_cpu(triple):
     arch = triple.split('-')[0]
     if arch == "i686":
-      return "i386"
+        return "i386"
     return arch
 
 def get_platform(triple):
-  return "%s-%s" % (get_kernel(triple), get_cpu(triple))
+    return "%s-%s" % (get_kernel(triple), get_cpu(triple))
 
 
 def cmd_out(cmdline):
-    p = subprocess.Popen(cmdline,
-                         stdout=subprocess.PIPE)
+    p = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
     return scrub(p.communicate()[0].strip())
 
 
 def local_rev_info(field):
     return cmd_out(["git", "--git-dir=" + os.path.join(src_dir, ".git"),
-                    "log", "-n", "1",
-                    "--format=%%%s" % field, "HEAD"])
+                            "log", "-n", "1",
+                            "--format=%%%s" % field, "HEAD"])
 
 
 def local_rev_full_sha():
@@ -127,10 +133,10 @@ def get_url_to_file(u,f):
     os.rename(tmpf, f)
 
 def snap_filename_hash_part(snap):
-  match = re.match(r".*([a-fA-F\d]{40}).tar.bz2$", snap)
-  if not match:
-    raise Exception("unable to find hash in filename: " + snap)
-  return match.group(1)
+    match = re.match(r".*([a-fA-F\d]{40}).tar.bz2$", snap)
+    if not match:
+        raise Exception("unable to find hash in filename: " + snap)
+    return match.group(1)
 
 def hash_file(x):
     h = sha_func()
@@ -142,13 +148,13 @@ def get_winnt_runtime_deps():
     runtime_deps = []
     path_dirs = os.environ["PATH"].split(';')
     for name in winnt_runtime_deps:
-      for dir in path_dirs:
-        matches = glob.glob(os.path.join(dir, name))
-        if matches:
-          runtime_deps.append(matches[0])
-          break
-      else:
-        raise Exception("Could not find runtime dependency: %s" % name)
+        for dir in path_dirs:
+            matches = glob.glob(os.path.join(dir, name))
+            if matches:
+                runtime_deps.append(matches[0])
+                break
+            else:
+                raise Exception("Could not find runtime dependency: %s" % name)
     return runtime_deps
 
 def make_snapshot(stage, triple):
@@ -160,31 +166,31 @@ def make_snapshot(stage, triple):
     file0 = partial_snapshot_name(date, rev, platform)
 
     def in_tar_name(fn):
-      cs = re.split(r"[\\/]", fn)
-      if len(cs) >= 2:
-        return os.sep.join(cs[-2:])
+        cs = re.split(r"[\\/]", fn)
+        if len(cs) >= 2:
+            return os.sep.join(cs[-2:])
 
     tar = tarfile.open(file0, "w:bz2")
 
     for name in snapshot_files[kernel]:
-      dir = stage
-      if stage == "stage1" and re.match(r"^lib/(lib)?std.*", name):
-        dir = "stage0"
-      fn_glob = os.path.join(triple, dir, name)
-      matches = glob.glob(fn_glob)
-      if not matches:
-        raise Exception("Not found file with name like " + fn_glob)
-      if len(matches) == 1:
-        tar.add(matches[0], "rust-stage0/" + in_tar_name(matches[0]))
-      else:
-        raise Exception("Found stale files: \n  %s\n"
-                        "Please make a clean build." % "\n  ".join(matches))
+        dir = stage
+        if stage == "stage1" and re.match(r"^lib/(lib)?std.*", name):
+            dir = "stage0"
+        fn_glob = os.path.join(triple, dir, name)
+        matches = glob.glob(fn_glob)
+        if not matches:
+            raise Exception("Not found file with name like " + fn_glob)
+        if len(matches) == 1:
+            tar.add(matches[0], "rust-stage0/" + in_tar_name(matches[0]))
+        else:
+            raise Exception("Found stale files: \n  %s\n"
+                    "Please make a clean build." % "\n  ".join(matches))
 
     if kernel=="winnt":
-      for path in get_winnt_runtime_deps():
-        tar.add(path, "rust-stage0/bin/" + os.path.basename(path))
-      tar.add(os.path.join(os.path.dirname(__file__), "third-party"),
-              "rust-stage0/bin/third-party")
+        for path in get_winnt_runtime_deps():
+            tar.add(path, "rust-stage0/bin/" + os.path.basename(path))
+        tar.add(os.path.join(os.path.dirname(__file__), "third-party"),
+                        "rust-stage0/bin/third-party")
 
     tar.close()
 
@@ -195,40 +201,60 @@ def make_snapshot(stage, triple):
 
     return file1
 
-def determine_curr_snapshot_info(triple):
-  i = 0
-  platform = get_platform(triple)
+def curr_snapshot_rev():
+    i = 0
+    found_snap = False
+    date = None
+    rev = None
 
-  found_file = False
-  found_snap = False
-  hsh = None
-  date = None
-  rev = None
+    f = open(snapshotfile)
+    for line in f.readlines():
+        i += 1
+        parsed = parse_line(i, line)
+        if (not parsed): continue
 
-  f = open(snapshotfile)
-  for line in f.readlines():
-    i += 1
-    parsed = parse_line(i, line)
-    if (not parsed): continue
+        if parsed["type"] == "snapshot":
+            date = parsed["date"]
+            rev = parsed["rev"]
+            found_snap = True
+            break
 
-    if found_snap and parsed["type"] == "file":
-      if parsed["platform"] == platform:
-        hsh = parsed["hash"]
-        found_file = True
-        break;
-    elif parsed["type"] == "snapshot":
-      date = parsed["date"]
-      rev = parsed["rev"]
-      found_snap = True
+    if not found_snap:
+        raise Exception("no snapshot entries in file")
 
-  if not found_snap:
-    raise Exception("no snapshot entries in file")
-
-  if not found_file:
-    raise Exception("no snapshot file found for platform %s, rev %s" %
-                    (platform, rev))
-
-  return (date, rev, platform, hsh)
+    return (date, rev)
 
 def determine_curr_snapshot(triple):
-  return full_snapshot_name(*determine_curr_snapshot_info(triple))
+    i = 0
+    platform = get_platform(triple)
+
+    found_file = False
+    found_snap = False
+    hsh = None
+    date = None
+    rev = None
+
+    f = open(snapshotfile)
+    for line in f.readlines():
+        i += 1
+        parsed = parse_line(i, line)
+        if (not parsed): continue
+
+        if found_snap and parsed["type"] == "file":
+            if parsed["platform"] == platform:
+                hsh = parsed["hash"]
+                found_file = True
+                break;
+        elif parsed["type"] == "snapshot":
+            date = parsed["date"]
+            rev = parsed["rev"]
+            found_snap = True
+
+    if not found_snap:
+        raise Exception("no snapshot entries in file")
+
+    if not found_file:
+        raise Exception("no snapshot file found for platform %s, rev %s" %
+                                        (platform, rev))
+
+    return full_snapshot_name(date, rev, platform, hsh)

src/etc/sugarise-doc-comments.py

@@ -1,5 +1,14 @@
 #!/usr/bin/env python
-# xfail-license
+#
+# Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 #
 # this script attempts to turn doc comment attributes (#[doc = "..."])

src/etc/tidy.py

@@ -1,5 +1,12 @@
-#!/usr/bin/env python
-# xfail-license
+# Copyright 2010-2014 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 import sys, fileinput, subprocess, re
 from licenseck import *
@@ -57,12 +64,13 @@ try:
             match = re.match(r'^.*//\s*SNAP\s+(\w+)', line)
             if match:
                 hsh = match.group(1)
-                a, b, c, phash = snapshot.determine_curr_snapshot_info()
-                if not phash.startswith(hsh):
-                    report_err("Snapshot out of date: " + line)
+                date, rev = snapshot.curr_snapshot_rev()
+                if not hsh.startswith(rev):
+                    report_err("snapshot out of date (" + date
+                      + "): " + line)
             else:
                 if "SNAP" in line:
-                    report_warn("Unmatched SNAP line: " + line)
+                    report_warn("unmatched SNAP line: " + line)
 
         if (line.find('\t') != -1 and
             fileinput.filename().find("Makefile") == -1):

src/etc/unicode.py

@@ -1,5 +1,14 @@
 #!/usr/bin/env python
-# xfail-license
+#
+# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 # This digests UnicodeData.txt and DerivedCoreProperties.txt and emits rust
 # code covering the core properties. Since this is a pretty rare event we

src/etc/ziggurat_tables.py

@@ -1,5 +1,14 @@
 #!/usr/bin/env python
-# xfail-license
+#
+# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
 
 # This creates the tables used for distributions implemented using the
 # ziggurat algorithm in `std::rand::distributions;`. They are

src/librustdoc/html/render.rs

@@ -250,7 +250,7 @@ pub fn run(mut crate: clean::Crate, dst: Path) -> io::IoResult<()> {
     let mut dst = cx.dst.join(crate.name.as_slice());
     if_ok!(mkdir(&dst));
     if_ok!(write(dst.join("jquery.js"),
-                 include_str!("static/jquery-2.0.3.min.js")));
+                 include_str!("static/jquery-2.1.0.min.js")));
     if_ok!(write(dst.join("main.js"), include_str!("static/main.js")));
     if_ok!(write(dst.join("main.css"), include_str!("static/main.css")));
     if_ok!(write(dst.join("normalize.css"),

src/librustdoc/html/static/normalize.css

@@ -1 +1 @@
-/*! normalize.css v2.1.2 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}