servo · bors-servo · Jul 14, 2016 · Jul 14, 2016 · Jul 14, 2016
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
@@ -2,6 +2,7 @@
 name = "canvas"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
@@ -2,6 +2,7 @@
 name = "canvas_traits"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
@@ -2,6 +2,7 @@
 name = "compositing"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
@@ -2,6 +2,7 @@
 name = "constellation"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml
@@ -2,6 +2,7 @@
 name = "devtools"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml
@@ -2,6 +2,7 @@
 name = "devtools_traits"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
@@ -3,6 +3,7 @@
 name = "gfx"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml
@@ -2,6 +2,7 @@
 name = "gfx_traits"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
@@ -2,6 +2,7 @@
 name = "layout"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
@@ -2,6 +2,7 @@
 name = "layout_thread"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml
@@ -2,6 +2,7 @@
 name = "layout_traits"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
@@ -2,6 +2,7 @@
 name = "msg"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
@@ -2,6 +2,7 @@
 name = "net"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
@@ -2,6 +2,7 @@
 name = "net_traits"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/plugins/Cargo.toml b/components/plugins/Cargo.toml
@@ -2,6 +2,7 @@
 name = "plugins"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml
@@ -2,6 +2,7 @@
 name = "profile"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/profile_traits/Cargo.toml b/components/profile_traits/Cargo.toml
@@ -2,6 +2,7 @@
 name = "profile_traits"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/range/Cargo.toml b/components/range/Cargo.toml
@@ -3,6 +3,7 @@
 name = "range"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -2,6 +2,7 @@
 name = "script"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 build = "build.rs"

diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml
@@ -2,6 +2,7 @@
 name = "script_layout_interface"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml
@@ -2,6 +2,7 @@
 name = "script_traits"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -3,6 +3,7 @@
 name = "servo"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 build = "build.rs"
 publish = false
 

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
@@ -2,6 +2,7 @@
 name = "style"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 build = "build.rs"

diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml
@@ -2,6 +2,7 @@
 name = "style_traits"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml
@@ -2,6 +2,7 @@
 name = "util"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
@@ -2,6 +2,7 @@
 name = "webdriver_server"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
@@ -2,6 +2,7 @@
 name = "geckoservo"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 build = "build.rs"
 

diff --git a/ports/geckolib/gecko_bindings/Cargo.toml b/ports/geckolib/gecko_bindings/Cargo.toml
@@ -2,6 +2,7 @@
 name = "gecko_bindings"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/ports/geckolib/string_cache/Cargo.toml b/ports/geckolib/string_cache/Cargo.toml
@@ -3,6 +3,7 @@ name = "string_cache"
 description = "A crate to allow using Gecko's nsIAtom as a replacement for string_cache."
 version = "0.2.20"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 publish = false
 
 [lib]

diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
@@ -2,6 +2,7 @@
 name = "glutin_app"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "glutin_app"

diff --git a/python/tidy/servo_tidy/licenseck.py b/python/tidy/servo_tidy/licenseck.py
@@ -82,3 +82,9 @@
 // except according to those terms.
 """,
 ]  # noqa: Indicate to flake8 that we do not want to check indentation here
+
+# The valid licenses, in the form we'd expect to see them in a Cargo.toml file.
+licenses_toml = [
+    'license = "MPL-2.0"',
+    'license = "MIT/Apache-2.0"',
+]
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
@@ -17,7 +17,7 @@
 import StringIO
 import subprocess
 import sys
-from licenseck import licenses
+from licenseck import licenses, licenses_toml
 
 # License and header checks
 EMACS_HEADER = "/* -*- Mode:"
@@ -295,9 +295,14 @@ def find_reverse_dependencies(dependency, version, content):
 def check_toml(file_name, lines):
     if not file_name.endswith(".toml"):
         raise StopIteration
+    ok_licensed = False
     for idx, line in enumerate(lines):
         if line.find("*") != -1:
             yield (idx + 1, "found asterisk instead of minimum version number")
+        for license in licenses_toml:
+            ok_licensed |= (license in line)
+    if not ok_licensed:
+        yield (0, ".toml file should contain a valid license.")
 
 
 def check_rust(file_name, lines):

diff --git a/support/android/build-apk/Cargo.toml b/support/android/build-apk/Cargo.toml
@@ -3,6 +3,7 @@
 name = "build-apk"
 version = "0.0.1"
 authors = ["Pierre Krieger <pierre.krieger1708@gmail.com>", "The Servo Project Developers"]
+license = "MPL-2.0"
 
 [[bin]]
 name = "build-apk"

diff --git a/tests/compiletest/helper/Cargo.toml b/tests/compiletest/helper/Cargo.toml
@@ -2,6 +2,7 @@
 name = "compiletest_helper"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "compiletest_helper"

diff --git a/tests/compiletest/plugin/Cargo.toml b/tests/compiletest/plugin/Cargo.toml
@@ -2,6 +2,7 @@
 name = "plugin_compiletest"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "plugin_compiletest"

diff --git a/tests/unit/gfx/Cargo.toml b/tests/unit/gfx/Cargo.toml
@@ -2,6 +2,7 @@
 name = "gfx_tests"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "gfx_tests"

diff --git a/tests/unit/layout/Cargo.toml b/tests/unit/layout/Cargo.toml
@@ -2,6 +2,7 @@
 name = "layout_tests"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "layout_tests"

diff --git a/tests/unit/net/Cargo.toml b/tests/unit/net/Cargo.toml
@@ -2,6 +2,7 @@
 name = "net_tests"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "net_tests"

diff --git a/tests/unit/net_traits/Cargo.toml b/tests/unit/net_traits/Cargo.toml
@@ -2,6 +2,7 @@
 name = "net_traits_tests"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "net_traits_tests"

diff --git a/tests/unit/profile/Cargo.toml b/tests/unit/profile/Cargo.toml
@@ -2,6 +2,7 @@
 name = "profile_tests"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "profile_tests"

diff --git a/tests/unit/script/Cargo.toml b/tests/unit/script/Cargo.toml
@@ -2,6 +2,7 @@
 name = "script_tests"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "script_tests"

diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml
@@ -2,6 +2,7 @@
 name = "style_tests"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "style_tests"

diff --git a/tests/unit/util/Cargo.toml b/tests/unit/util/Cargo.toml
@@ -2,6 +2,7 @@
 name = "util_tests"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
 
 [lib]
 name = "util_tests"