diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-05-20 10:29:48 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-05-20 10:29:48 -0500 |
| commit | d68730a0fc755149c1093021e34e7d34693429b7 (patch) | |
| tree | 4a8a66df889c6c6908238d6b285d192f0a5f2b40 | |
| parent | 165bfd6d5f901ef2e2619dbcc010166106cebd0b (diff) | |
| parent | 717b443eec9dac822d4599f93c723440f1c4ec9d (diff) | |
| download | servo-d68730a0fc755149c1093021e34e7d34693429b7.tar.gz servo-d68730a0fc755149c1093021e34e7d34693429b7.zip | |
Auto merge of #6074 - pgonda:lint-fix-struct-enum-variants, r=Manishearth
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6074)
<!-- Reviewable:end -->
| -rw-r--r-- | components/plugins/Cargo.toml | 4 | ||||
| -rw-r--r-- | components/plugins/lints/unrooted_must_root.rs | 8 | ||||
| -rw-r--r-- | components/servo/Cargo.lock | 6 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 6 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 6 |
5 files changed, 17 insertions, 13 deletions
diff --git a/components/plugins/Cargo.toml b/components/plugins/Cargo.toml index 133bad303a5..946394fbe10 100644 --- a/components/plugins/Cargo.toml +++ b/components/plugins/Cargo.toml @@ -8,5 +8,5 @@ name = "plugins" path = "lib.rs" plugin = true -[dependencies.tenacious] -git = "https://github.com/Manishearth/rust-tenacious.git"
\ No newline at end of file +[dependencies] +tenacious = "*" diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs index 7a39f6cc4d5..e819f8d0e4d 100644 --- a/components/plugins/lints/unrooted_must_root.rs +++ b/components/plugins/lints/unrooted_must_root.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use syntax::{ast, codemap, visit}; +use syntax::{ast, codemap, visit, ast_map}; use syntax::attr::AttrMetaMethods; use rustc::lint::{Context, LintPass, LintArray}; use rustc::middle::ty::expr_ty; @@ -52,7 +52,11 @@ impl LintPass for UnrootedPass { } /// All structs containing #[must_root] types must be #[must_root] themselves fn check_struct_def(&mut self, cx: &Context, def: &ast::StructDef, _i: ast::Ident, _gen: &ast::Generics, id: ast::NodeId) { - if cx.tcx.map.expect_item(id).attrs.iter().all(|a| !a.check_name("must_root")) { + let item = match cx.tcx.map.get(id) { + ast_map::Node::NodeItem(item) => item, + _ => cx.tcx.map.expect_item(cx.tcx.map.get_parent(id)), + }; + if item.attrs.iter().all(|a| !a.check_name("must_root")) { for ref field in def.fields.iter() { lint_unrooted_ty(cx, &*field.node.ty, "Type must be rooted, use #[must_root] on the struct definition to propagate"); diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index f2184517738..352e112f61b 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -938,7 +938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "plugins" version = "0.0.1" dependencies = [ - "tenacious 0.0.1 (git+https://github.com/Manishearth/rust-tenacious.git)", + "tenacious 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1186,8 +1186,8 @@ dependencies = [ [[package]] name = "tenacious" -version = "0.0.1" -source = "git+https://github.com/Manishearth/rust-tenacious.git#5112359cd36682cd7df3a7bb9a963299890be26c" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index ac322cc6079..a46d44a54a3 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -928,7 +928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "plugins" version = "0.0.1" dependencies = [ - "tenacious 0.0.1 (git+https://github.com/Manishearth/rust-tenacious.git)", + "tenacious 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1179,8 +1179,8 @@ dependencies = [ [[package]] name = "tenacious" -version = "0.0.1" -source = "git+https://github.com/Manishearth/rust-tenacious.git#5112359cd36682cd7df3a7bb9a963299890be26c" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 815e6cf8af0..e4fe46d5642 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -799,7 +799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "plugins" version = "0.0.1" dependencies = [ - "tenacious 0.0.1 (git+https://github.com/Manishearth/rust-tenacious.git)", + "tenacious 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1049,8 +1049,8 @@ dependencies = [ [[package]] name = "tenacious" -version = "0.0.1" -source = "git+https://github.com/Manishearth/rust-tenacious.git#5112359cd36682cd7df3a7bb9a963299890be26c" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "time" |