Renaming: rejoin -> merge

uklotzde · Serial-ATA · commit 533cd7dcff99 · 2023-01-20T08:34:33.000-05:00
diff --git a/src/ape/tag/mod.rs b/src/ape/tag/mod.rs
@@ -6,7 +6,7 @@ use crate::ape::tag::item::{ApeItem, ApeItemRef};
 use crate::error::{LoftyError, Result};
 use crate::tag::item::{ItemKey, ItemValue, TagItem};
 use crate::tag::{Tag, TagType};
-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};
+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};
 
 use std::borrow::Cow;
 use std::convert::TryInto;
@@ -289,7 +289,7 @@ impl TagExt for ApeTag {
 	}
 }
 
-impl SplitAndRejoinTag for ApeTag {
+impl SplitAndMergeTag for ApeTag {
 	fn split_tag(&mut self) -> Tag {
 		fn split_pair(
 			content: &str,
@@ -349,7 +349,7 @@ impl SplitAndRejoinTag for ApeTag {
 		tag
 	}
 
-	fn rejoin_tag(&mut self, tag: Tag) {
+	fn merge_tag(&mut self, tag: Tag) {
 		for item in tag.items {
 			if let Ok(ape_item) = item.try_into() {
 				self.insert(ape_item)
@@ -377,7 +377,7 @@ impl From<ApeTag> for Tag {
 impl From<Tag> for ApeTag {
 	fn from(input: Tag) -> Self {
 		let mut ape_tag = Self::default();
-		ape_tag.rejoin_tag(input);
+		ape_tag.merge_tag(input);
 		ape_tag
 	}
 }
diff --git a/src/id3/v1/tag.rs b/src/id3/v1/tag.rs
@@ -2,7 +2,7 @@ use crate::error::{LoftyError, Result};
 use crate::id3::v1::constants::GENRES;
 use crate::tag::item::{ItemKey, ItemValue, TagItem};
 use crate::tag::{Tag, TagType};
-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};
+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};
 
 use std::borrow::Cow;
 use std::fs::{File, OpenOptions};
@@ -238,7 +238,7 @@ impl TagExt for ID3v1Tag {
 	}
 }
 
-impl SplitAndRejoinTag for ID3v1Tag {
+impl SplitAndMergeTag for ID3v1Tag {
 	fn split_tag(&mut self) -> Tag {
 		let mut tag = Tag::new(TagType::ID3v1);
 
@@ -272,7 +272,7 @@ impl SplitAndRejoinTag for ID3v1Tag {
 		tag
 	}
 
-	fn rejoin_tag(&mut self, tag: Tag) {
+	fn merge_tag(&mut self, tag: Tag) {
 		*self = tag.into();
 	}
 }
diff --git a/src/id3/v2/tag.rs b/src/id3/v2/tag.rs
@@ -9,7 +9,7 @@ use crate::id3::v2::items::language_frame::LanguageFrame;
 use crate::picture::{Picture, PictureType, TOMBSTONE_PICTURE};
 use crate::tag::item::{ItemKey, ItemValue, TagItem};
 use crate::tag::{Tag, TagType};
-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};
+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};
 use crate::util::text::TextEncoding;
 
 use std::borrow::Cow;
@@ -533,7 +533,7 @@ impl TagExt for ID3v2Tag {
 	}
 }
 
-impl SplitAndRejoinTag for ID3v2Tag {
+impl SplitAndMergeTag for ID3v2Tag {
 	fn split_tag(&mut self) -> Tag {
 		fn split_pair(
 			content: &str,
@@ -693,7 +693,7 @@ impl SplitAndRejoinTag for ID3v2Tag {
 		tag
 	}
 
-	fn rejoin_tag(&mut self, mut tag: Tag) {
+	fn merge_tag(&mut self, mut tag: Tag) {
 		fn join_items(tag: &mut Tag, key: &ItemKey) -> String {
 			let mut iter = tag.take_strings(key);
 
@@ -748,7 +748,7 @@ impl From<ID3v2Tag> for Tag {
 impl From<Tag> for ID3v2Tag {
 	fn from(input: Tag) -> Self {
 		let mut id3v2_tag = ID3v2Tag::default();
-		id3v2_tag.rejoin_tag(input);
+		id3v2_tag.merge_tag(input);
 		id3v2_tag
 	}
 }
diff --git a/src/iff/aiff/tag.rs b/src/iff/aiff/tag.rs
@@ -3,7 +3,7 @@ use crate::iff::chunk::Chunks;
 use crate::macros::err;
 use crate::tag::item::{ItemKey, ItemValue, TagItem};
 use crate::tag::{Tag, TagType};
-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};
+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};
 
 use std::borrow::Cow;
 use std::convert::TryFrom;
@@ -216,12 +216,12 @@ impl TagExt for AIFFTextChunks {
 	}
 }
 
-impl SplitAndRejoinTag for AIFFTextChunks {
+impl SplitAndMergeTag for AIFFTextChunks {
 	fn split_tag(&mut self) -> Tag {
 		std::mem::take(self).into()
 	}
 
-	fn rejoin_tag(&mut self, tag: Tag) {
+	fn merge_tag(&mut self, tag: Tag) {
 		*self = tag.into();
 	}
 }
diff --git a/src/iff/wav/tag/mod.rs b/src/iff/wav/tag/mod.rs
@@ -4,7 +4,7 @@ mod write;
 use crate::error::{LoftyError, Result};
 use crate::tag::item::{ItemKey, ItemValue, TagItem};
 use crate::tag::{Tag, TagType};
-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};
+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};
 
 use std::borrow::Cow;
 use std::fs::{File, OpenOptions};
@@ -211,12 +211,12 @@ impl TagExt for RIFFInfoList {
 	}
 }
 
-impl SplitAndRejoinTag for RIFFInfoList {
+impl SplitAndMergeTag for RIFFInfoList {
 	fn split_tag(&mut self) -> Tag {
 		std::mem::take(self).into()
 	}
 
-	fn rejoin_tag(&mut self, tag: Tag) {
+	fn merge_tag(&mut self, tag: Tag) {
 		*self = tag.into();
 	}
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -178,7 +178,7 @@ pub use crate::tag::{Tag, TagType};
 pub use tag::item::{ItemKey, ItemValue, TagItem};
 pub use util::text::TextEncoding;
 
-pub use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};
+pub use crate::traits::{Accessor, SplitAndMergeTag, TagExt};
 
 pub use picture::PictureInformation;
 
diff --git a/src/mp4/ilst/mod.rs b/src/mp4/ilst/mod.rs
@@ -10,7 +10,7 @@ use crate::mp4::ilst::atom::AtomDataStorage;
 use crate::picture::{Picture, PictureType, TOMBSTONE_PICTURE};
 use crate::tag::item::{ItemKey, ItemValue, TagItem};
 use crate::tag::{Tag, TagType};
-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};
+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};
 use atom::{AdvisoryRating, Atom, AtomData};
 
 use std::borrow::Cow;
@@ -377,7 +377,7 @@ impl TagExt for Ilst {
 	}
 }
 
-impl SplitAndRejoinTag for Ilst {
+impl SplitAndMergeTag for Ilst {
 	fn split_tag(&mut self) -> Tag {
 		let mut tag = Tag::new(TagType::MP4ilst);
 
@@ -446,7 +446,7 @@ impl SplitAndRejoinTag for Ilst {
 		tag
 	}
 
-	fn rejoin_tag(&mut self, tag: Tag) {
+	fn merge_tag(&mut self, tag: Tag) {
 		fn convert_to_uint(space: &mut Option<u16>, cont: &str) {
 			if let Ok(num) = cont.parse::<u16>() {
 				*space = Some(num);
@@ -538,7 +538,7 @@ impl From<Ilst> for Tag {
 impl From<Tag> for Ilst {
 	fn from(input: Tag) -> Self {
 		let mut ilst = Self::default();
-		ilst.rejoin_tag(input);
+		ilst.merge_tag(input);
 		ilst
 	}
 }
diff --git a/src/ogg/tag.rs b/src/ogg/tag.rs
@@ -7,7 +7,7 @@ use crate::picture::{Picture, PictureInformation};
 use crate::probe::Probe;
 use crate::tag::item::{ItemKey, ItemValue, TagItem};
 use crate::tag::{Tag, TagType};
-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};
+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};
 
 use std::borrow::Cow;
 use std::fs::{File, OpenOptions};
@@ -328,7 +328,7 @@ impl TagExt for VorbisComments {
 	}
 }
 
-impl SplitAndRejoinTag for VorbisComments {
+impl SplitAndMergeTag for VorbisComments {
 	fn split_tag(&mut self) -> Tag {
 		let mut tag = Tag::new(TagType::VorbisComments);
 
@@ -359,7 +359,7 @@ impl SplitAndRejoinTag for VorbisComments {
 		tag
 	}
 
-	fn rejoin_tag(&mut self, mut tag: Tag) {
+	fn merge_tag(&mut self, mut tag: Tag) {
 		if let Some(TagItem {
 			item_value: ItemValue::Text(val),
 			..
@@ -403,7 +403,7 @@ impl From<VorbisComments> for Tag {
 impl From<Tag> for VorbisComments {
 	fn from(input: Tag) -> Self {
 		let mut vorbis_comments = Self::default();
-		vorbis_comments.rejoin_tag(input);
+		vorbis_comments.merge_tag(input);
 		vorbis_comments
 	}
 }
diff --git a/src/tag/mod.rs b/src/tag/mod.rs
@@ -6,7 +6,7 @@ use crate::file::FileType;
 use crate::macros::err;
 use crate::picture::{Picture, PictureType};
 use crate::probe::Probe;
-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};
+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};
 use item::{ItemKey, ItemValue, TagItem};
 
 use std::borrow::Cow;
@@ -583,12 +583,12 @@ impl TagExt for Tag {
 	}
 }
 
-impl SplitAndRejoinTag for Tag {
+impl SplitAndMergeTag for Tag {
 	fn split_tag(&mut self) -> Self {
 		std::mem::replace(self, Self::new(self.tag_type))
 	}
 
-	fn rejoin_tag(&mut self, tag: Self) {
+	fn merge_tag(&mut self, tag: Self) {
 		*self = tag;
 	}
 }
diff --git a/src/traits.rs b/src/traits.rs
@@ -233,15 +233,15 @@ pub trait TagExt: Accessor + Into<Tag> + Sized {
 	fn clear(&mut self);
 }
 
-/// Split and rejoin tags.
+/// Split and merge tags.
 ///
 /// Useful and required for implementing lossless read/modify/write round trips.
 ///
 /// # Example
 ///
 /// ```no_run
 /// use lofty::mpeg::MPEGFile;
-/// use lofty::{AudioFile, ItemKey, SplitAndRejoinTag as _};
+/// use lofty::{AudioFile, ItemKey, SplitAndMergeTag as _};
 ///
 /// // Read the tag from a file
 /// # let mut file = std::fs::OpenOptions::new().write(true).open("/path/to/file.mp3")?;
@@ -264,19 +264,19 @@ pub trait TagExt: Accessor + Into<Tag> + Sized {
 /// tag.remove_key(&ItemKey::Composer);
 ///
 /// // ID3v2 <- [`lofty::Tag`]
-/// id3v2.rejoin_tag(tag);
+/// id3v2.merge_tag(tag);
 ///
 /// // Write the changes back into the file
 /// mpeg_file.save_to(&mut file)?;
 ///
 /// # Ok::<(), lofty::LoftyError>(())
 /// ```
-pub trait SplitAndRejoinTag {
+pub trait SplitAndMergeTag {
 	/// Extract and split generic contents into a [`Tag`].
 	///
 	/// Leaves the remainder that cannot be represented in the
 	/// resulting tag in `self`. This is useful if the modified [`Tag`]
-	/// is rejoined later using [`SplitAndRejoinTag::rejoin_tag`].
+	/// is merged later using [`SplitAndMergeTag::merge_tag`].
 	// NOTE: Using the "typestate pattern" (http://cliffle.com/blog/rust-typestate/)
 	// to represent the intermediate state turned out as less flexible
 	// and useful than expected.
@@ -285,11 +285,15 @@ pub trait SplitAndRejoinTag {
 	/// Rejoin a [`Tag`].
 	///
 	/// Rejoin a tag that has previously been obtained with
-	/// [`SplitAndRejoinTag::split_tag`].
+	/// [`SplitAndMergeTag::split_tag`].
 	///
 	/// Restores the original representation merged with the contents of
 	/// `tag` for further processing, e.g. writing back into a file.
-	fn rejoin_tag(&mut self, tag: Tag);
+	///
+	/// This method must only be called once and after [`Self::split_tag`]!
+	/// Otherwise the behavior is undefined and may result in redundancies
+	/// or inconsistencies.
+	fn merge_tag(&mut self, tag: Tag);
 }
 
 // TODO: https://github.com/rust-lang/rust/issues/59359

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ use crate::error::{LoftyError, Result};`
`2`	`2`	`use crate::id3::v1::constants::GENRES;`
`3`	`3`	`use crate::tag::item::{ItemKey, ItemValue, TagItem};`
`4`	`4`	`use crate::tag::{Tag, TagType};`
`5`		`-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};`
	`5`	`+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};`
`6`	`6`
`7`	`7`	`use std::borrow::Cow;`
`8`	`8`	`use std::fs::{File, OpenOptions};`
`@@ -238,7 +238,7 @@ impl TagExt for ID3v1Tag {`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`
`241`		`-impl SplitAndRejoinTag for ID3v1Tag {`
	`241`	`+impl SplitAndMergeTag for ID3v1Tag {`
`242`	`242`	`fn split_tag(&mut self) -> Tag {`
`243`	`243`	`let mut tag = Tag::new(TagType::ID3v1);`
`244`	`244`
`@@ -272,7 +272,7 @@ impl SplitAndRejoinTag for ID3v1Tag {`
`272`	`272`	`tag`
`273`	`273`	`}`
`274`	`274`
`275`		`- fn rejoin_tag(&mut self, tag: Tag) {`
	`275`	`+ fn merge_tag(&mut self, tag: Tag) {`
`276`	`276`	`*self = tag.into();`
`277`	`277`	`}`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ use crate::id3::v2::items::language_frame::LanguageFrame;`
`9`	`9`	`use crate::picture::{Picture, PictureType, TOMBSTONE_PICTURE};`
`10`	`10`	`use crate::tag::item::{ItemKey, ItemValue, TagItem};`
`11`	`11`	`use crate::tag::{Tag, TagType};`
`12`		`-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};`
	`12`	`+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};`
`13`	`13`	`use crate::util::text::TextEncoding;`
`14`	`14`
`15`	`15`	`use std::borrow::Cow;`
`@@ -533,7 +533,7 @@ impl TagExt for ID3v2Tag {`
`533`	`533`	`}`
`534`	`534`	`}`
`535`	`535`
`536`		`-impl SplitAndRejoinTag for ID3v2Tag {`
	`536`	`+impl SplitAndMergeTag for ID3v2Tag {`
`537`	`537`	`fn split_tag(&mut self) -> Tag {`
`538`	`538`	`fn split_pair(`
`539`	`539`	`content: &str,`
`@@ -693,7 +693,7 @@ impl SplitAndRejoinTag for ID3v2Tag {`
`693`	`693`	`tag`
`694`	`694`	`}`
`695`	`695`
`696`		`- fn rejoin_tag(&mut self, mut tag: Tag) {`
	`696`	`+ fn merge_tag(&mut self, mut tag: Tag) {`
`697`	`697`	`fn join_items(tag: &mut Tag, key: &ItemKey) -> String {`
`698`	`698`	`let mut iter = tag.take_strings(key);`
`699`	`699`
`@@ -748,7 +748,7 @@ impl From<ID3v2Tag> for Tag {`
`748`	`748`	`impl From<Tag> for ID3v2Tag {`
`749`	`749`	`fn from(input: Tag) -> Self {`
`750`	`750`	`let mut id3v2_tag = ID3v2Tag::default();`
`751`		`- id3v2_tag.rejoin_tag(input);`
	`751`	`+ id3v2_tag.merge_tag(input);`
`752`	`752`	`id3v2_tag`
`753`	`753`	`}`
`754`	`754`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ use crate::iff::chunk::Chunks;`
`3`	`3`	`use crate::macros::err;`
`4`	`4`	`use crate::tag::item::{ItemKey, ItemValue, TagItem};`
`5`	`5`	`use crate::tag::{Tag, TagType};`
`6`		`-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};`
	`6`	`+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};`
`7`	`7`
`8`	`8`	`use std::borrow::Cow;`
`9`	`9`	`use std::convert::TryFrom;`
`@@ -216,12 +216,12 @@ impl TagExt for AIFFTextChunks {`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`
`219`		`-impl SplitAndRejoinTag for AIFFTextChunks {`
	`219`	`+impl SplitAndMergeTag for AIFFTextChunks {`
`220`	`220`	`fn split_tag(&mut self) -> Tag {`
`221`	`221`	`std::mem::take(self).into()`
`222`	`222`	`}`
`223`	`223`
`224`		`- fn rejoin_tag(&mut self, tag: Tag) {`
	`224`	`+ fn merge_tag(&mut self, tag: Tag) {`
`225`	`225`	`*self = tag.into();`
`226`	`226`	`}`
`227`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ mod write;`
`4`	`4`	`use crate::error::{LoftyError, Result};`
`5`	`5`	`use crate::tag::item::{ItemKey, ItemValue, TagItem};`
`6`	`6`	`use crate::tag::{Tag, TagType};`
`7`		`-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};`
	`7`	`+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};`
`8`	`8`
`9`	`9`	`use std::borrow::Cow;`
`10`	`10`	`use std::fs::{File, OpenOptions};`
`@@ -211,12 +211,12 @@ impl TagExt for RIFFInfoList {`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`
`214`		`-impl SplitAndRejoinTag for RIFFInfoList {`
	`214`	`+impl SplitAndMergeTag for RIFFInfoList {`
`215`	`215`	`fn split_tag(&mut self) -> Tag {`
`216`	`216`	`std::mem::take(self).into()`
`217`	`217`	`}`
`218`	`218`
`219`		`- fn rejoin_tag(&mut self, tag: Tag) {`
	`219`	`+ fn merge_tag(&mut self, tag: Tag) {`
`220`	`220`	`*self = tag.into();`
`221`	`221`	`}`
`222`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ use crate::mp4::ilst::atom::AtomDataStorage;`
`10`	`10`	`use crate::picture::{Picture, PictureType, TOMBSTONE_PICTURE};`
`11`	`11`	`use crate::tag::item::{ItemKey, ItemValue, TagItem};`
`12`	`12`	`use crate::tag::{Tag, TagType};`
`13`		`-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};`
	`13`	`+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};`
`14`	`14`	`use atom::{AdvisoryRating, Atom, AtomData};`
`15`	`15`
`16`	`16`	`use std::borrow::Cow;`
`@@ -377,7 +377,7 @@ impl TagExt for Ilst {`
`377`	`377`	`}`
`378`	`378`	`}`
`379`	`379`
`380`		`-impl SplitAndRejoinTag for Ilst {`
	`380`	`+impl SplitAndMergeTag for Ilst {`
`381`	`381`	`fn split_tag(&mut self) -> Tag {`
`382`	`382`	`let mut tag = Tag::new(TagType::MP4ilst);`
`383`	`383`
`@@ -446,7 +446,7 @@ impl SplitAndRejoinTag for Ilst {`
`446`	`446`	`tag`
`447`	`447`	`}`
`448`	`448`
`449`		`- fn rejoin_tag(&mut self, tag: Tag) {`
	`449`	`+ fn merge_tag(&mut self, tag: Tag) {`
`450`	`450`	`fn convert_to_uint(space: &mut Option<u16>, cont: &str) {`
`451`	`451`	`if let Ok(num) = cont.parse::<u16>() {`
`452`	`452`	`*space = Some(num);`
`@@ -538,7 +538,7 @@ impl From<Ilst> for Tag {`
`538`	`538`	`impl From<Tag> for Ilst {`
`539`	`539`	`fn from(input: Tag) -> Self {`
`540`	`540`	`let mut ilst = Self::default();`
`541`		`- ilst.rejoin_tag(input);`
	`541`	`+ ilst.merge_tag(input);`
`542`	`542`	`ilst`
`543`	`543`	`}`
`544`	`544`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use crate::picture::{Picture, PictureInformation};`
`7`	`7`	`use crate::probe::Probe;`
`8`	`8`	`use crate::tag::item::{ItemKey, ItemValue, TagItem};`
`9`	`9`	`use crate::tag::{Tag, TagType};`
`10`		`-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};`
	`10`	`+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};`
`11`	`11`
`12`	`12`	`use std::borrow::Cow;`
`13`	`13`	`use std::fs::{File, OpenOptions};`
`@@ -328,7 +328,7 @@ impl TagExt for VorbisComments {`
`328`	`328`	`}`
`329`	`329`	`}`
`330`	`330`
`331`		`-impl SplitAndRejoinTag for VorbisComments {`
	`331`	`+impl SplitAndMergeTag for VorbisComments {`
`332`	`332`	`fn split_tag(&mut self) -> Tag {`
`333`	`333`	`let mut tag = Tag::new(TagType::VorbisComments);`
`334`	`334`
`@@ -359,7 +359,7 @@ impl SplitAndRejoinTag for VorbisComments {`
`359`	`359`	`tag`
`360`	`360`	`}`
`361`	`361`
`362`		`- fn rejoin_tag(&mut self, mut tag: Tag) {`
	`362`	`+ fn merge_tag(&mut self, mut tag: Tag) {`
`363`	`363`	`if let Some(TagItem {`
`364`	`364`	`item_value: ItemValue::Text(val),`
`365`	`365`	`..`
`@@ -403,7 +403,7 @@ impl From<VorbisComments> for Tag {`
`403`	`403`	`impl From<Tag> for VorbisComments {`
`404`	`404`	`fn from(input: Tag) -> Self {`
`405`	`405`	`let mut vorbis_comments = Self::default();`
`406`		`- vorbis_comments.rejoin_tag(input);`
	`406`	`+ vorbis_comments.merge_tag(input);`
`407`	`407`	`vorbis_comments`
`408`	`408`	`}`
`409`	`409`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ use crate::file::FileType;`
`6`	`6`	`use crate::macros::err;`
`7`	`7`	`use crate::picture::{Picture, PictureType};`
`8`	`8`	`use crate::probe::Probe;`
`9`		`-use crate::traits::{Accessor, SplitAndRejoinTag, TagExt};`
	`9`	`+use crate::traits::{Accessor, SplitAndMergeTag, TagExt};`
`10`	`10`	`use item::{ItemKey, ItemValue, TagItem};`
`11`	`11`
`12`	`12`	`use std::borrow::Cow;`
`@@ -583,12 +583,12 @@ impl TagExt for Tag {`
`583`	`583`	`}`
`584`	`584`	`}`
`585`	`585`
`586`		`-impl SplitAndRejoinTag for Tag {`
	`586`	`+impl SplitAndMergeTag for Tag {`
`587`	`587`	`fn split_tag(&mut self) -> Self {`
`588`	`588`	`std::mem::replace(self, Self::new(self.tag_type))`
`589`	`589`	`}`
`590`	`590`
`591`		`- fn rejoin_tag(&mut self, tag: Self) {`
	`591`	`+ fn merge_tag(&mut self, tag: Self) {`
`592`	`592`	`*self = tag;`
`593`	`593`	`}`
`594`	`594`	`}`