Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7195 - servo:rustup_20150814, r=Ms2ger

Browse source 
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 -->
This commit is contained in:
bors-servo 2015-08-14 12:53:54 -06:00
commit 13e7de482c
6 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/plugins/lints/unrooted_must_root.rs
View file

@ -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

12
components/servo/Cargo.lock generated
View file

@ -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"

1
components/style/lib.rs
View file

@ -7,7 +7,6 @@
#![feature(core_intrinsics)]
#![feature(custom_attribute)]
#![feature(custom_derive)]
#![feature(hasher_write)]
#![feature(plugin)]
#![feature(vec_push_all)]

12
ports/cef/Cargo.lock generated
View file

@ -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"

12
ports/gonk/Cargo.lock generated
View file

@ -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"

2
rust-snapshot-hash
View file

@ -1 +1 @@
87055a68c3194db212456f99ece080728a5fc2f8/rustc-1.3.0-dev
7b7fc67dd453c470a48dbdcf64693a93293c9ab0/rustc-1.4.0-dev