aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/flow_ref.rs
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2024-04-22 20:20:47 +0200
committerGitHub <noreply@github.com>2024-04-22 18:20:47 +0000
commita0640c8524b471462af8a352d87c38fa63337914 (patch)
tree5564446fbd289c6bd9a23d51518aaa85de286ad6 /components/layout/flow_ref.rs
parentf65010c97d50f0e2172c9d4477cc702099d44263 (diff)
downloadservo-a0640c8524b471462af8a352d87c38fa63337914.tar.gz
servo-a0640c8524b471462af8a352d87c38fa63337914.zip
Address issues uncovered by rust-1.78 beta (#32130)
This change makes changes to allow Servo to compile with the 1.78 version of Rust: - Dead code is removd (Rust seems to have gotten better at detecting it). - The `FlowRef` `DerefMut` is updated according to @SimonSapin's advice [^1]. - The `imports.rs` now explicitly silences warnings about unused imports. [^1]: https://github.com/servo/servo/issues/6503#issuecomment-2066088179 <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they should not change behavior. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/layout/flow_ref.rs')
-rw-r--r--components/layout/flow_ref.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/flow_ref.rs b/components/layout/flow_ref.rs
index 4657db77040..b9827bb7eb6 100644
--- a/components/layout/flow_ref.rs
+++ b/components/layout/flow_ref.rs
@@ -51,7 +51,7 @@ impl FlowRef {
#[allow(unsafe_code)]
#[allow(clippy::should_implement_trait)]
pub fn deref_mut(this: &mut FlowRef) -> &mut dyn Flow {
- let ptr: *const dyn Flow = &*this.0;
+ let ptr: *const dyn Flow = Arc::as_ptr(&this.0);
unsafe { &mut *(ptr as *mut dyn Flow) }
}
}