diff --git a/c/Cargo.toml b/c/Cargo.toml index e454352d..b3b9a261 100644 --- a/c/Cargo.toml +++ b/c/Cargo.toml @@ -15,7 +15,7 @@ gl = "0.6" libc = "0.2" [dependencies.pathfinder_canvas] -features = ["text"] +features = ["pf-text"] path = "../canvas" [dependencies.pathfinder_content] diff --git a/canvas/Cargo.toml b/canvas/Cargo.toml index 5bd59f9a..e40b87e0 100644 --- a/canvas/Cargo.toml +++ b/canvas/Cargo.toml @@ -29,4 +29,4 @@ rev = "a2d683856ba1f2d0095b12dd7823d1602a87614e" optional = true [features] -text = ["pathfinder_text", "skribo", "font-kit"] +pf-text = ["pathfinder_text", "skribo", "font-kit"] diff --git a/canvas/src/lib.rs b/canvas/src/lib.rs index 46b72870..e87d4ecd 100644 --- a/canvas/src/lib.rs +++ b/canvas/src/lib.rs @@ -26,14 +26,14 @@ use std::f32::consts::PI; use std::mem; use std::sync::Arc; use text::FontCollection; -#[cfg(feature = "text")] +#[cfg(feature = "pf-text")] pub use text::TextMetrics; pub use text::CanvasFontContext; const HAIRLINE_STROKE_WIDTH: f32 = 0.0333; const DEFAULT_FONT_SIZE: f32 = 10.0; -#[cfg_attr(not(feature = "text"), path = "text_no_text.rs")] +#[cfg_attr(not(feature = "pf-text"), path = "text_no_text.rs")] mod text; pub struct CanvasRenderingContext2D { @@ -53,9 +53,9 @@ impl CanvasRenderingContext2D { } pub fn from_scene(font_context: CanvasFontContext, scene: Scene) -> CanvasRenderingContext2D { - #[cfg(feature = "text")] + #[cfg(feature = "pf-text")] let default_font_collection = font_context.default_font_collection.clone(); - #[cfg(not(feature = "text"))] + #[cfg(not(feature = "pf-text"))] let default_font_collection = Arc::new(FontCollection); CanvasRenderingContext2D { scene, diff --git a/examples/canvas_metal_minimal/Cargo.toml b/examples/canvas_metal_minimal/Cargo.toml index b7ecdef1..9950a900 100644 --- a/examples/canvas_metal_minimal/Cargo.toml +++ b/examples/canvas_metal_minimal/Cargo.toml @@ -13,7 +13,7 @@ sdl2 = "0.32" sdl2-sys = "0.32" [dependencies.pathfinder_canvas] -features = ["text"] +features = ["pf-text"] path = "../../canvas" [dependencies.pathfinder_content] diff --git a/examples/canvas_moire/Cargo.toml b/examples/canvas_moire/Cargo.toml index b07b600d..13b0a60b 100644 --- a/examples/canvas_moire/Cargo.toml +++ b/examples/canvas_moire/Cargo.toml @@ -10,7 +10,7 @@ sdl2 = "0.32" sdl2-sys = "0.32" [dependencies.pathfinder_canvas] -features = ["text"] +features = ["pf-text"] path = "../../canvas" [dependencies.pathfinder_content] diff --git a/examples/canvas_text/Cargo.toml b/examples/canvas_text/Cargo.toml index e3301e01..ebb95f04 100644 --- a/examples/canvas_text/Cargo.toml +++ b/examples/canvas_text/Cargo.toml @@ -11,7 +11,7 @@ sdl2 = "0.32" sdl2-sys = "0.32" [dependencies.pathfinder_canvas] -features = ["text"] +features = ["pf-text"] path = "../../canvas" [dependencies.pathfinder_content]