aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/plugins/lints/str_to_string.rs2
-rw-r--r--components/plugins/lints/unrooted_must_root.rs6
-rw-r--r--components/plugins/utils.rs2
-rw-r--r--components/servo/Cargo.lock81
-rw-r--r--ports/cef/Cargo.lock77
-rw-r--r--ports/gonk/Cargo.lock77
-rw-r--r--rust-snapshot-hash2
7 files changed, 170 insertions, 77 deletions
diff --git a/components/plugins/lints/str_to_string.rs b/components/plugins/lints/str_to_string.rs
index e58ff4e93ac..03a6b4f3a3e 100644
--- a/components/plugins/lints/str_to_string.rs
+++ b/components/plugins/lints/str_to_string.rs
@@ -22,7 +22,7 @@ impl LintPass for StrToStringPass {
fn check_expr(&mut self, cx: &Context, expr: &ast::Expr) {
match expr.node {
ast::ExprMethodCall(ref method, _, ref args)
- if method.node.as_str() == "to_string"
+ if method.node.name.as_str() == "to_string"
&& is_str(cx, &*args[0]) => {
cx.span_lint(STR_TO_STRING, expr.span,
"str.to_owned() is more efficient than str.to_string(), please use it instead");
diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs
index d51fe19871e..3d34c28db46 100644
--- a/components/plugins/lints/unrooted_must_root.rs
+++ b/components/plugins/lints/unrooted_must_root.rs
@@ -121,9 +121,9 @@ impl LintPass for UnrootedPass {
block: &ast::Block, _span: codemap::Span, id: ast::NodeId) {
match kind {
visit::FkItemFn(i, _, _, _, _, _) |
- visit::FkMethod(i, _, _) if i.as_str() == "new"
- || i.as_str() == "new_inherited"
- || i.as_str() == "new_initialized" => {
+ visit::FkMethod(i, _, _) if i.name.as_str() == "new"
+ || i.name.as_str() == "new_inherited"
+ || i.name.as_str() == "new_initialized" => {
self.in_new_function = true;
return;
},
diff --git a/components/plugins/utils.rs b/components/plugins/utils.rs
index 9cd843ae5a7..573eca63f6e 100644
--- a/components/plugins/utils.rs
+++ b/components/plugins/utils.rs
@@ -22,7 +22,7 @@ pub fn match_ty_unwrap<'a>(ty: &'a Ty, segments: &[&str]) -> Option<&'a [P<Ty>]>
// I could muck around with the maps and find the full path
// however the more efficient way is to simply reverse the iterators and zip them
// which will compare them in reverse until one of them runs out of segments
- if seg.iter().rev().zip(segments.iter().rev()).all(|(a,b)| a.identifier.as_str() == *b) {
+ if seg.iter().rev().zip(segments.iter().rev()).all(|(a,b)| a.identifier.name.as_str() == *b) {
match seg.last() {
Some(&PathSegment {parameters: AngleBracketedParameters(ref a), ..}) => {
Some(&a.types)
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index b032dd45ff1..f9f7cac3336 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -49,7 +49,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "aster"
-version = "0.3.3"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -235,6 +235,14 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "debug_unreachable"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "devtools"
version = "0.0.1"
dependencies = [
@@ -449,7 +457,7 @@ dependencies = [
"serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -581,8 +589,8 @@ dependencies = [
"mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -726,8 +734,8 @@ dependencies = [
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -981,6 +989,15 @@ dependencies = [
]
[[package]]
+name = "phf_codegen"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_generator 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "phf_generator"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1071,7 +1088,7 @@ name = "quasi_codegen"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1154,8 +1171,8 @@ dependencies = [
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1202,8 +1219,8 @@ dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1219,7 +1236,7 @@ name = "serde_codegen"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1282,32 +1299,33 @@ dependencies = [
[[package]]
name = "string_cache"
-version = "0.1.6"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "string_cache_plugin"
-version = "0.1.4"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "string_cache_shared"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "debug_unreachable 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_codegen 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "style"
@@ -1328,8 +1346,8 @@ dependencies = [
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@@ -1341,8 +1359,8 @@ dependencies = [
"cssparser 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@@ -1411,6 +1429,14 @@ dependencies = [
]
[[package]]
+name = "unreachable"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "url"
version = "0.2.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1472,6 +1498,11 @@ dependencies = [
]
[[package]]
+name = "void"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "webdriver"
version = "0.2.0"
source = "git+https://github.com/jgraham/webdriver-rust.git#caf906e67d818f2db5d4f31b08abb0fee561ec43"
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index ba335d8e7c6..f040ba33a6d 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -48,7 +48,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "aster"
-version = "0.3.3"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -234,6 +234,14 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "debug_unreachable"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "devtools"
version = "0.0.1"
dependencies = [
@@ -448,7 +456,7 @@ dependencies = [
"serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -573,8 +581,8 @@ dependencies = [
"mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -718,8 +726,8 @@ dependencies = [
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -960,6 +968,15 @@ dependencies = [
]
[[package]]
+name = "phf_codegen"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_generator 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "phf_generator"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1050,7 +1067,7 @@ name = "quasi_codegen"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1133,8 +1150,8 @@ dependencies = [
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1173,8 +1190,8 @@ dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1190,7 +1207,7 @@ name = "serde_codegen"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1279,32 +1296,33 @@ dependencies = [
[[package]]
name = "string_cache"
-version = "0.1.6"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "string_cache_plugin"
-version = "0.1.4"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "string_cache_shared"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "debug_unreachable 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_codegen 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "style"
@@ -1325,8 +1343,8 @@ dependencies = [
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@@ -1394,6 +1412,14 @@ dependencies = [
]
[[package]]
+name = "unreachable"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "url"
version = "0.2.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1445,6 +1471,11 @@ dependencies = [
]
[[package]]
+name = "void"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "webdriver"
version = "0.2.0"
source = "git+https://github.com/jgraham/webdriver-rust.git#caf906e67d818f2db5d4f31b08abb0fee561ec43"
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 7ec75154726..edb65650242 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -35,7 +35,7 @@ dependencies = [
[[package]]
name = "aster"
-version = "0.3.3"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -211,6 +211,14 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "debug_unreachable"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unreachable 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "devtools"
version = "0.0.1"
dependencies = [
@@ -427,7 +435,7 @@ dependencies = [
"serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -507,8 +515,8 @@ dependencies = [
"mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -652,8 +660,8 @@ dependencies = [
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"unicode-bidi 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -868,6 +876,15 @@ dependencies = [
]
[[package]]
+name = "phf_codegen"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_generator 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "phf_generator"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -958,7 +975,7 @@ name = "quasi_codegen"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1041,8 +1058,8 @@ dependencies = [
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"tendril 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1081,8 +1098,8 @@ dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1098,7 +1115,7 @@ name = "serde_codegen"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1177,32 +1194,33 @@ dependencies = [
[[package]]
name = "string_cache"
-version = "0.1.6"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "string_cache_plugin"
-version = "0.1.4"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_shared 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "string_cache_shared"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "debug_unreachable 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_codegen 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "style"
@@ -1223,8 +1241,8 @@ dependencies = [
"serde 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@@ -1292,6 +1310,14 @@ dependencies = [
]
[[package]]
+name = "unreachable"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "url"
version = "0.2.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1334,6 +1360,11 @@ dependencies = [
]
[[package]]
+name = "void"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "webdriver"
version = "0.2.0"
source = "git+https://github.com/jgraham/webdriver-rust.git#caf906e67d818f2db5d4f31b08abb0fee561ec43"
diff --git a/rust-snapshot-hash b/rust-snapshot-hash
index cb99cade858..8f8341f6a47 100644
--- a/rust-snapshot-hash
+++ b/rust-snapshot-hash
@@ -1 +1 @@
-e4e93196e16030ebf7a20c473849534235d676f8/rustc-1.3.0-dev
+87055a68c3194db212456f99ece080728a5fc2f8/rustc-1.3.0-dev