Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make minor presentation-related cleanups #2230

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Make minor presentation-related cleanups #2230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7690a6e
Rename argument to improve clarity
hannobraun Feb 21, 2024
b342e6a
Remove unused code
hannobraun Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions crates/fj-core/src/layers/presentation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ impl Command<Presentation> for DeriveObject {
}
}

/// Command for `Layer<Presentation>`
pub enum PresentationCommand {}

/// Event produced by `Layer<Presentation>`
#[derive(Clone)]
pub enum PresentationEvent {
Expand Down
6 changes: 3 additions & 3 deletions crates/fj-core/src/operations/derive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ use crate::{
/// Mark a store object as derived from another
pub trait DeriveFrom {
/// Mark this object as derived from the other object provided
fn derive_from(self, other: &Self, core: &mut Core) -> Self;
fn derive_from(self, original: &Self, core: &mut Core) -> Self;
}

impl<T> DeriveFrom for Handle<T>
where
Self: Into<AnyObject<Stored>>,
{
fn derive_from(self, other: &Self, core: &mut Core) -> Self {
fn derive_from(self, original: &Self, core: &mut Core) -> Self {
core.layers
.presentation
.derive_object(other.clone().into(), self.clone().into());
.derive_object(original.clone().into(), self.clone().into());
self
}
}