aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/plugins/lints/unrooted_must_root.rs8
-rw-r--r--components/servo/Cargo.lock12
-rw-r--r--components/style/lib.rs1
-rw-r--r--ports/cef/Cargo.lock12
-rw-r--r--ports/gonk/Cargo.lock12
-rw-r--r--rust-snapshot-hash2
6 files changed, 23 insertions, 24 deletions
diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs
index dc116f311eb..3bdb94b59ac 100644
--- a/components/plugins/lints/unrooted_must_root.rs
+++ b/components/plugins/lints/unrooted_must_root.rs
@@ -49,13 +49,13 @@ fn is_unrooted_ty(cx: &Context, ty: &ty::TyS, in_new_function: bool) -> bool {
match t.sty {
ty::TyStruct(did, _) |
ty::TyEnum(did, _) => {
- if cx.tcx.has_attr(did, "must_root") {
+ if cx.tcx.has_attr(did.did, "must_root") {
ret = true;
false
- } else if cx.tcx.has_attr(did, "allow_unrooted_interior") {
+ } else if cx.tcx.has_attr(did.did, "allow_unrooted_interior") {
false
- } else if match_def_path(cx, did, &["core", "cell", "Ref"])
- || match_def_path(cx, did, &["core", "cell", "RefMut"]) {
+ } else if match_def_path(cx, did.did, &["core", "cell", "Ref"])
+ || match_def_path(cx, did.did, &["core", "cell", "RefMut"]) {
// Ref and RefMut are borrowed pointers, okay to hold unrooted stuff
// since it will be rooted elsewhere
false
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 85625b828a3..76b71e38998 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -58,7 +58,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "aster"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1095,7 +1095,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "plugins"
version = "0.0.1"
dependencies = [
- "tenacious 0.0.6 (git+https://github.com/servo/rust-tenacious)",
+ "tenacious 0.0.9 (git+https://github.com/servo/rust-tenacious)",
]
[[package]]
@@ -1158,7 +1158,7 @@ name = "quasi_codegen"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1316,7 +1316,7 @@ name = "serde_codegen"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.1 (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)",
]
@@ -1473,8 +1473,8 @@ dependencies = [
[[package]]
name = "tenacious"
-version = "0.0.6"
-source = "git+https://github.com/servo/rust-tenacious#8f878d812a95dc44dab9c03096fcf8a52687868a"
+version = "0.0.9"
+source = "git+https://github.com/servo/rust-tenacious#a04fe4a6e6c332f94b491b9369b8e50e94b3c37d"
[[package]]
name = "tendril"
diff --git a/components/style/lib.rs b/components/style/lib.rs
index ca3aa62cc4c..a6a53464c26 100644
--- a/components/style/lib.rs
+++ b/components/style/lib.rs
@@ -7,7 +7,6 @@
#![feature(core_intrinsics)]
#![feature(custom_attribute)]
#![feature(custom_derive)]
-#![feature(hasher_write)]
#![feature(plugin)]
#![feature(vec_push_all)]
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 26d172b5e9d..9bc322af160 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -57,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "aster"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1073,7 +1073,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "plugins"
version = "0.0.1"
dependencies = [
- "tenacious 0.0.6 (git+https://github.com/servo/rust-tenacious)",
+ "tenacious 0.0.9 (git+https://github.com/servo/rust-tenacious)",
]
[[package]]
@@ -1136,7 +1136,7 @@ name = "quasi_codegen"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1286,7 +1286,7 @@ name = "serde_codegen"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.1 (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)",
]
@@ -1455,8 +1455,8 @@ dependencies = [
[[package]]
name = "tenacious"
-version = "0.0.6"
-source = "git+https://github.com/servo/rust-tenacious#8f878d812a95dc44dab9c03096fcf8a52687868a"
+version = "0.0.9"
+source = "git+https://github.com/servo/rust-tenacious#a04fe4a6e6c332f94b491b9369b8e50e94b3c37d"
[[package]]
name = "tendril"
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 0277e542ac3..795e76e2d96 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -43,7 +43,7 @@ dependencies = [
[[package]]
name = "aster"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -979,7 +979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "plugins"
version = "0.0.1"
dependencies = [
- "tenacious 0.0.6 (git+https://github.com/servo/rust-tenacious)",
+ "tenacious 0.0.9 (git+https://github.com/servo/rust-tenacious)",
]
[[package]]
@@ -1042,7 +1042,7 @@ name = "quasi_codegen"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1192,7 +1192,7 @@ name = "serde_codegen"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "aster 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aster 0.4.1 (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)",
]
@@ -1351,8 +1351,8 @@ dependencies = [
[[package]]
name = "tenacious"
-version = "0.0.6"
-source = "git+https://github.com/servo/rust-tenacious#8f878d812a95dc44dab9c03096fcf8a52687868a"
+version = "0.0.9"
+source = "git+https://github.com/servo/rust-tenacious#a04fe4a6e6c332f94b491b9369b8e50e94b3c37d"
[[package]]
name = "tendril"
diff --git a/rust-snapshot-hash b/rust-snapshot-hash
index 8f8341f6a47..c2e55a43523 100644
--- a/rust-snapshot-hash
+++ b/rust-snapshot-hash
@@ -1 +1 @@
-87055a68c3194db212456f99ece080728a5fc2f8/rustc-1.3.0-dev
+7b7fc67dd453c470a48dbdcf64693a93293c9ab0/rustc-1.4.0-dev
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-01 13:04:23 +0000