Skip to content

Commit

Permalink
servo: Merge #18327 - Upgrade to rustc 1.21.0-nightly (7eeac1b81 2017…
Browse files Browse the repository at this point in the history
…-08-30) (from servo:rustup); r=nox

Fix this error in the new Rust Nightly:

```rust
   Compiling script v0.0.1 (file:///home/simon/servo2/components/script)
error[E0599]: no method named `trace` found for type `&fn(&dom::node::Node) -> u16` in the current scope
   --> /home/simon/servo2/components/script/dom/treewalker.rs:464:10
    |
464 | #[derive(JSTraceable)]
    |          ^^^^^^^^^^^
    |
    = note: JSTraceable is a function, perhaps you wish to call it
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `trace`, perhaps you need to implement it:
            candidate #1: `dom::bindings::trace::JSTraceable`

error: aborting due to previous error

error: Could not compile `script`.
```

~I’ve tried to reproduce it in a minimal test case, but `impl<A, B> SomeTrait for fn(A) -> B` did not apply for `fn(&u32) -> u32` even on Rust 1.19.0 stable. So I don’t know what changed.~ This is very likely servo/servo#18327.

Source-Repo: https://github.com/servo/servo
Source-Revision: fd833d9f18cd9196502b9768ab0ac8c1498b2f68

UltraBlame original commit: 2093d5141fb21195b1f84894b2921bcace8c3cfd
  • Loading branch information
marco-c committed Oct 1, 2019
1 parent cf15357 commit 776bcd0
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 1 deletion.
38 changes: 38 additions & 0 deletions servo/components/script/dom/bindings/trace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2740,6 +2740,44 @@ JSTracer
unsafe
impl
<
'
a
A
B
>
JSTraceable
for
fn
(
&
A
)
-
>
B
{
#
[
inline
]
unsafe
fn
trace
(
&
self
_
:
*
mut
JSTracer
)
{
}
}
unsafe
impl
<
T
>
JSTraceable
Expand Down
2 changes: 2 additions & 0 deletions servo/components/script_plugins/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ i
span
.
ctxt
(
)
.
outer
(
Expand Down
2 changes: 1 addition & 1 deletion servo/rust-toolchain
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ nightly
-
08
-
30
31

0 comments on commit 776bcd0

Please sign in to comment.