From e06e1645713f4a7e8fa841c6ad45a23ce5ea30e4 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Thu, 16 Apr 2020 14:39:14 +0200 Subject: [PATCH] Make WeakRuleNode::from_ptr be unsafe --- components/style/rule_tree/core.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/components/style/rule_tree/core.rs b/components/style/rule_tree/core.rs index 0b1afd8548a..4c96de291c4 100644 --- a/components/style/rule_tree/core.rs +++ b/components/style/rule_tree/core.rs @@ -369,7 +369,7 @@ impl StrongRuleNode { } pub(super) fn downgrade(&self) -> WeakRuleNode { - WeakRuleNode::from_ptr(self.p) + unsafe { WeakRuleNode::from_ptr(self.p) } } /// Get the parent rule node of this rule node. @@ -750,12 +750,6 @@ impl Drop for StrongRuleNode { } } -impl<'a> From<&'a StrongRuleNode> for WeakRuleNode { - fn from(node: &'a StrongRuleNode) -> Self { - WeakRuleNode::from_ptr(node.p) - } -} - impl WeakRuleNode { #[inline] fn ptr(&self) -> *mut RuleNode { @@ -770,7 +764,7 @@ impl WeakRuleNode { unsafe { StrongRuleNode::from_ptr(self.p) } } - fn from_ptr(p: ptr::NonNull) -> Self { + unsafe fn from_ptr(p: ptr::NonNull) -> Self { WeakRuleNode { p } } }