aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2021-02-25 10:30:33 +0100
committerSimon Sapin <simon.sapin@exyr.org>2021-02-25 20:31:43 +0100
commitaa854ec2d27a9705fdd5c759bab80a9882fe4f45 (patch)
tree465ef36322d01574fffab50b297594f2d3a6334f
parent479a42a980e77ffc17559fd0e2a86fb4b6f3d6e8 (diff)
downloadservo-aa854ec2d27a9705fdd5c759bab80a9882fe4f45.tar.gz
servo-aa854ec2d27a9705fdd5c759bab80a9882fe4f45.zip
Upgrade to rustc 1.52.0-nightly (a8486b64b 2021-02-24)
-rw-r--r--components/script/lib.rs1
-rw-r--r--components/script_plugins/lib.rs2
-rw-r--r--rust-toolchain2
3 files changed, 3 insertions, 2 deletions
diff --git a/components/script/lib.rs b/components/script/lib.rs
index e1a07583cdd..86935833157 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -4,6 +4,7 @@
#![feature(assoc_char_funcs)]
#![feature(const_fn)]
+#![feature(const_fn_fn_ptr_basics)]
#![feature(core_intrinsics)]
#![feature(drain_filter)]
#![feature(plugin)]
diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs
index 5259366c7fd..211b6117781 100644
--- a/components/script_plugins/lib.rs
+++ b/components/script_plugins/lib.rs
@@ -90,7 +90,7 @@ fn has_lint_attr(sym: &Symbols, attrs: &[Attribute], name: Symbol) -> bool {
attrs.iter().any(|attr| {
matches!(
&attr.kind,
- AttrKind::Normal(attr_item)
+ AttrKind::Normal(attr_item, _)
if attr_item.path.segments.len() == 2 &&
attr_item.path.segments[0].ident.name == sym.unrooted_must_root_lint &&
attr_item.path.segments[1].ident.name == name
diff --git a/rust-toolchain b/rust-toolchain
index 5bc8eb6009c..d6ee05dcfce 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-09-27
+nightly-2021-02-25