diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-14 12:53:54 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-14 12:53:54 -0600 |
| commit | 13e7de482c0f58ca5af30dbca5d94e6b9cedd1cd (patch) | |
| tree | 46d2c61f4ea4ada4b933d784d053cabca353e64f /components/plugins/lints | |
| parent | d4d18f51f2ac46191d94bfe322a2c0164fb98f17 (diff) | |
| parent | 91bc14711d3528c2dc0f5440770d94d1a189e5bc (diff) | |
| download | servo-13e7de482c0f58ca5af30dbca5d94e6b9cedd1cd.tar.gz servo-13e7de482c0f58ca5af30dbca5d94e6b9cedd1cd.zip | |
Auto merge of #7195 - servo:rustup_20150814, r=Ms2ger
Upgrade Rust to nightly 2015-08-10
Still needs snapshot.
Snapshot probably could also work as today's nightly (I wasn't able to download the latest one due to choppy internet), there isn't any plugins churn I know of
r? @larsbergstrom
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7195)
<!-- Reviewable:end -->
Diffstat (limited to 'components/plugins/lints')
| -rw-r--r-- | components/plugins/lints/unrooted_must_root.rs | 8 |
1 files changed, 4 insertions, 4 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 |