From acfe0cc4783c46546fda645bf1603a7b78b847c9 Mon Sep 17 00:00:00 2001
From: Will Brindle <will.brindle@bazaarvoice.com>
Date: Fri, 4 Oct 2019 22:18:37 +0100
Subject: [PATCH] chore: follow naming conventions for functions

---
 core/src/movie_clip.rs | 12 ++++++------
 swf/src/read.rs        | 20 ++++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/core/src/movie_clip.rs b/core/src/movie_clip.rs
index 08e81b905..98d277dc9 100644
--- a/core/src/movie_clip.rs
+++ b/core/src/movie_clip.rs
@@ -629,8 +629,8 @@ impl<'gc, 'a> MovieClip<'gc> {
             TagCode::DefineShape4 => self.define_shape(context, reader, 4),
             TagCode::DefineSound => self.define_sound(context, reader, tag_len),
             TagCode::DefineSprite => self.define_sprite(context, reader, tag_len, morph_shapes),
-            TagCode::DefineText => self.define_text(context, reader),
-            TagCode::DefineText2 => self.define_text2(context, reader),
+            TagCode::DefineText => self.define_text_1(context, reader),
+            TagCode::DefineText2 => self.define_text_2(context, reader),
             TagCode::FrameLabel => {
                 self.frame_label(context, reader, tag_len, cur_frame, &mut static_data)
             }
@@ -1051,12 +1051,12 @@ impl<'gc, 'a> MovieClip<'gc> {
     }
 
     #[inline]
-    fn define_text(
+    fn define_text_1(
         &mut self,
         context: &mut UpdateContext<'_, 'gc, '_>,
         reader: &mut SwfStream<&'a [u8]>,
     ) -> DecodeResult {
-        let text = reader.read_define_text()?;
+        let text = reader.read_define_text_1()?;
         let text_object = Text::from_swf_tag(context, &text);
         context
             .library
@@ -1065,12 +1065,12 @@ impl<'gc, 'a> MovieClip<'gc> {
     }
 
     #[inline]
-    fn define_text2(
+    fn define_text_2(
         &mut self,
         context: &mut UpdateContext<'_, 'gc, '_>,
         reader: &mut SwfStream<&'a [u8]>,
     ) -> DecodeResult {
-        let text = reader.read_define_text2()?;
+        let text = reader.read_define_text_2()?;
         let text_object = Text::from_swf_tag(context, &text);
         context
             .library
diff --git a/swf/src/read.rs b/swf/src/read.rs
index 0d6fb0612..2e9e8bb22 100644
--- a/swf/src/read.rs
+++ b/swf/src/read.rs
@@ -400,8 +400,12 @@ impl<R: Read> Reader<R> {
             Some(TagCode::DefineSound) => {
                 Tag::DefineSound(Box::new(tag_reader.read_define_sound()?))
             }
-            Some(TagCode::DefineText) => Tag::DefineText(Box::new(tag_reader.read_define_text()?)),
-            Some(TagCode::DefineText2) => Tag::DefineText(Box::new(tag_reader.read_define_text2()?)),
+            Some(TagCode::DefineText) => {
+                Tag::DefineText(Box::new(tag_reader.read_define_text_1()?))
+            }
+            Some(TagCode::DefineText2) => {
+                Tag::DefineText(Box::new(tag_reader.read_define_text_2()?))
+            }
             Some(TagCode::DefineVideoStream) => tag_reader.read_define_video_stream()?,
             Some(TagCode::EnableTelemetry) => {
                 tag_reader.read_u16()?; // Reserved
@@ -2428,7 +2432,7 @@ impl<R: Read> Reader<R> {
         })
     }
 
-    pub fn read_define_text(&mut self) -> Result<Text> {
+    pub fn read_define_text_1(&mut self) -> Result<Text> {
         let id = self.read_character_id()?;
         let bounds = self.read_rectangle()?;
         let matrix = self.read_matrix()?;
@@ -2436,7 +2440,7 @@ impl<R: Read> Reader<R> {
         let num_advance_bits = self.read_u8()?;
 
         let mut records = vec![];
-        while let Some(record) = self.read_text_record(num_glyph_bits, num_advance_bits)? {
+        while let Some(record) = self.read_text_record_1(num_glyph_bits, num_advance_bits)? {
             records.push(record);
         }
 
@@ -2448,7 +2452,7 @@ impl<R: Read> Reader<R> {
         })
     }
 
-    pub fn read_define_text2(&mut self) -> Result<Text> {
+    pub fn read_define_text_2(&mut self) -> Result<Text> {
         let id = self.read_character_id()?;
         let bounds = self.read_rectangle()?;
         let matrix = self.read_matrix()?;
@@ -2456,7 +2460,7 @@ impl<R: Read> Reader<R> {
         let num_advance_bits = self.read_u8()?;
 
         let mut records = vec![];
-        while let Some(record) = self.read_text_record2(num_glyph_bits, num_advance_bits)? {
+        while let Some(record) = self.read_text_record_2(num_glyph_bits, num_advance_bits)? {
             records.push(record);
         }
 
@@ -2468,7 +2472,7 @@ impl<R: Read> Reader<R> {
         })
     }
 
-    fn read_text_record(
+    fn read_text_record_1(
         &mut self,
         num_glyph_bits: u8,
         num_advance_bits: u8,
@@ -2525,7 +2529,7 @@ impl<R: Read> Reader<R> {
         }))
     }
 
-    fn read_text_record2(
+    fn read_text_record_2(
         &mut self,
         num_glyph_bits: u8,
         num_advance_bits: u8,