diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-03-06 15:30:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 15:30:43 -0500 |
| commit | a0f14ceb7be9a8f1af4fb1eb41a8e8194cb6c541 (patch) | |
| tree | d8755879cd1a0a5b44530777dfe535bf60123214 /components/script/dom/bindings/trace.rs | |
| parent | 62afb52f84418b970ac12814b1af3df584c7dc9f (diff) | |
| parent | b5aa83f63314e3ff337c1888c818bf1b7c07a06e (diff) | |
| download | servo-a0f14ceb7be9a8f1af4fb1eb41a8e8194cb6c541.tar.gz servo-a0f14ceb7be9a8f1af4fb1eb41a8e8194cb6c541.zip | |
Auto merge of #25918 - servo:vtable-pointers-are-not-comparable, r=jdm
Don't compare vtable pointers anymore
Diffstat (limited to 'components/script/dom/bindings/trace.rs')
| -rw-r--r-- | components/script/dom/bindings/trace.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 631731e39a6..2d6b6c04379 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -891,7 +891,11 @@ impl RootedTraceableSet { unsafe fn remove(traceable: *const dyn JSTraceable) { ROOTED_TRACEABLES.with(|ref traceables| { let mut traceables = traceables.borrow_mut(); - let idx = match traceables.set.iter().rposition(|x| *x == traceable) { + let idx = match traceables + .set + .iter() + .rposition(|x| *x as *const () == traceable as *const ()) + { Some(idx) => idx, None => unreachable!(), }; |