From 7917afce5d73c661c3a33fdcffca4473a67a2efb Mon Sep 17 00:00:00 2001 From: Francesco BV Date: Thu, 29 Oct 2026 11:42:25 +0100 Subject: [PATCH] render: explicit imports for XCLIP clipping after #2239 #2239 replaced the glob imports in blocks.rs and viewports.rs with explicit lists; the XCLIP code relied on the globs for `Clip`, `append_clipped_keep`, `clip` and `Pen`. Import them by name. Co-Authored-By: Claude Opus 5.5 (1M context) --- crates/render/src/blocks.rs | 2 +- crates/render/src/viewports.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/render/src/blocks.rs b/crates/render/src/blocks.rs index 9782ae177..460c7e5da 100644 --- a/crates/render/src/blocks.rs +++ b/crates/render/src/blocks.rs @@ -1,7 +1,7 @@ use super::draw::entity; use super::props::{resolve, resolve_common, transparency}; use super::text_entity::{mtext, place_text_entity}; -use super::{Builder, Color, Ctx, Entity, EntityKind, Ink, Lineweight, Mat3, Vec2}; +use super::{Builder, Clip, Color, Ctx, Entity, EntityKind, Ink, Lineweight, Mat3, Vec2, append_clipped_keep, clip}; pub(crate) fn sub_ctx<'a>(ctx: &Ctx<'a>, e: &Entity, m: Mat3) -> Ctx<'a> { let layer = if e.common.layer == "0" { ctx.block_layer.clone() } else { Some(e.common.layer.clone()) }; diff --git a/crates/render/src/viewports.rs b/crates/render/src/viewports.rs index a3b585601..8edfa39ec 100644 --- a/crates/render/src/viewports.rs +++ b/crates/render/src/viewports.rs @@ -5,7 +5,7 @@ use super::draw::entity; #[cfg(not(target_arch = "wasm32"))] use super::pipeline::PARALLEL_CHUNK; use super::pipeline::{Options, style_table, top_ctx, with_point_view}; -use super::{Bounds2, Builder, Ctx, Drawing, Entity, EntityKind, Handle, MAX_BLOCK_EXPANSION, Mat3, Space, Vec2, clip, paper, pen, plotstyle}; +use super::{Bounds2, Builder, Ctx, Drawing, Entity, EntityKind, Handle, MAX_BLOCK_EXPANSION, Mat3, Pen, Space, Vec2, clip, paper, pen, plotstyle}; /// Upper bound on viewports drawn per layout (hostile files). pub(crate) const MAX_VIEWPORTS: usize = 256;