@@ -405,16 +405,6 @@ impl Effect<'_> {
405405 this
406406 }
407407
408- #[ inline]
409- pub fn effect_type ( & self ) -> EffectType {
410- EffectType ( self . raw . type_ )
411- }
412-
413- #[ inline]
414- pub fn id ( & self ) -> EffectId {
415- EffectId ( self . raw . id )
416- }
417-
418408 /// Changes the [`EffectId`] stored in this [`Effect`].
419409 ///
420410 /// By default, effects use ID `-1`, which is appropriate when uploading a new effect to a
@@ -428,31 +418,21 @@ impl Effect<'_> {
428418 self
429419 }
430420
431- #[ inline]
432- pub fn direction ( & self ) -> u16 {
433- self . raw . direction
434- }
435-
436421 #[ inline]
437422 pub fn with_direction ( mut self , dir : u16 ) -> Self {
438423 self . raw . direction = dir;
439424 self
440425 }
441426
442- #[ inline]
443- pub fn trigger ( & self ) -> Trigger {
444- Trigger ( self . raw . trigger )
445- }
446-
447427 #[ inline]
448428 pub fn with_trigger ( mut self , trigger : Trigger ) -> Self {
449429 self . raw . trigger = trigger. 0 ;
450430 self
451431 }
452432
453433 #[ inline]
454- pub fn replay ( & self ) -> Replay {
455- Replay ( self . raw . replay )
434+ pub fn effect_type ( & self ) -> EffectType {
435+ EffectType ( self . raw . type_ )
456436 }
457437
458438 #[ inline]
@@ -461,6 +441,26 @@ impl Effect<'_> {
461441 self
462442 }
463443
444+ #[ inline]
445+ pub fn id ( & self ) -> EffectId {
446+ EffectId ( self . raw . id )
447+ }
448+
449+ #[ inline]
450+ pub fn direction ( & self ) -> u16 {
451+ self . raw . direction
452+ }
453+
454+ #[ inline]
455+ pub fn trigger ( & self ) -> Trigger {
456+ Trigger ( self . raw . trigger )
457+ }
458+
459+ #[ inline]
460+ pub fn replay ( & self ) -> Replay {
461+ Replay ( self . raw . replay )
462+ }
463+
464464 pub fn kind ( & self ) -> Option < EffectKind < ' _ > > {
465465 // Safety relies on making it impossible to construct `Effect`s with a mismatched type.
466466 unsafe {
0 commit comments