Merge pull request #2230 from hannobraun/presentation

Make minor presentation-related cleanups
hannobraun · Feb 21, 2024 · 813dd89 · 813dd89
2 parents 622ddd5 + b342e6a
commit 813dd89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/crates/fj-core/src/layers/presentation.rs b/crates/fj-core/src/layers/presentation.rs
@@ -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 {

diff --git a/crates/fj-core/src/operations/derive.rs b/crates/fj-core/src/operations/derive.rs
@@ -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
     }
 }