fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 14:18:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Spell the elided Graphic and Artboard lifetimes in return paths

Browse Source
This commit is contained in:
Dennis Kobert
2026-09-06 15:48:45 +00:00
parent c9525d76c4
commit fc9e69a7a7
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/src/messages/tool/tool_messages/artboard_tool.rs
View File

@@ -576,7 +576,7 @@ mod test_artboard {
/// A leveled wire introspects as its whole legacy list, so each `extend`
/// occurrence yields one list rather than one element.
async fn get_artboards(editor: &mut EditorTestUtils) -> List<Artboard> {
async fn get_artboards(editor: &mut EditorTestUtils) -> List<Artboard<'_>> {
let instrumented = match editor.eval_graph().await {
Ok(instrumented) => instrumented,
Err(e) => panic!("Failed to evaluate graph: {e}"),

2
node-graph/libraries/graphic-types/src/artboard.rs
View File

@@ -19,7 +19,7 @@ impl<'e> Artboard<'e> {
Self(content)
}
pub fn as_graphic_list(&self) -> &List<Graphic> {
pub fn as_graphic_list(&self) -> &List<Graphic<'_>> {
&self.0
}

14
node-graph/libraries/graphic-types/src/graphic/mod.rs
View File

@@ -65,10 +65,10 @@ pub(in crate::graphic) fn detable_items<'e, T: Clone + Send + Sync + 'static>(li
/// never constructs a legacy interior.
pub trait IntoGraphicElement: Clone + Send + Sync + CacheHash + 'static {
/// `None` reports arena exhaustion.
fn into_graphic_element(self, arena: &core_types::arena::Arena) -> Option<Graphic>;
fn into_graphic_element(self, arena: &core_types::arena::Arena) -> Option<Graphic<'_>>;
}
fn list_group<T: Clone + Send + Sync + CacheHash + PartialEq + dyn_any::StaticTypeSized>(list: List<T>, arena: &core_types::arena::Arena) -> Option<Graphic>
fn list_group<T: Clone + Send + Sync + CacheHash + PartialEq + dyn_any::StaticTypeSized>(list: List<T>, arena: &core_types::arena::Arena) -> Option<Graphic<'_>>
where
T::Static: Clone + Send + Sync,
{
@@ -82,13 +82,13 @@ macro_rules! into_graphic_element {
($($leaf:ident: $element:ty;)*) => {
$(
impl IntoGraphicElement for $element {
fn into_graphic_element(self, _arena: &core_types::arena::Arena) -> Option<Graphic> {
fn into_graphic_element(self, _arena: &core_types::arena::Arena) -> Option<Graphic<'_>> {
Some(Graphic::$leaf(self))
}
}
impl IntoGraphicElement for List<$element> {
fn into_graphic_element(self, arena: &core_types::arena::Arena) -> Option<Graphic> {
fn into_graphic_element(self, arena: &core_types::arena::Arena) -> Option<Graphic<'_>> {
list_group(self, arena)
}
}
@@ -106,13 +106,13 @@ into_graphic_element! {
}
impl IntoGraphicElement for Graphic<'static> {
fn into_graphic_element(self, _arena: &core_types::arena::Arena) -> Option<Graphic> {
fn into_graphic_element(self, _arena: &core_types::arena::Arena) -> Option<Graphic<'_>> {
Some(self)
}
}
impl IntoGraphicElement for List<Graphic<'static>> {
fn into_graphic_element(self, arena: &core_types::arena::Arena) -> Option<Graphic> {
fn into_graphic_element(self, arena: &core_types::arena::Arena) -> Option<Graphic<'_>> {
list_group(self, arena)
}
}
@@ -340,7 +340,7 @@ impl From<DVec2> for Graphic<'_> {
// Note: List conversions handled by blanket impl in gcore
impl<'e> Graphic<'e> {
pub fn as_graphic(&self) -> Option<&List<Graphic>> {
pub fn as_graphic(&self) -> Option<&List<Graphic<'_>>> {
match self {
Graphic::Graphic(graphic) => Some(graphic),
_ => None,