Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 19 deletions

diff --git a/toolkit/components/places/bookmark_sync/src/store.rs b/toolkit/components/places/bookmark_sync/src/store.rs
index 6e8d8024b4..e5cf973e5d 100644
--- a/toolkit/components/places/bookmark_sync/src/store.rs
+++ b/toolkit/components/places/bookmark_sync/src/store.rs
@@ -1219,7 +1219,6 @@ trait Column<T> {
     fn from_column(raw: T) -> Result<Self>
     where
         Self: Sized;
-    fn into_column(self) -> T;
 }
 
 impl Column<i64> for Kind {
@@ -1233,16 +1232,6 @@ impl Column<i64> for Kind {
             _ => return Err(Error::UnknownItemKind(raw)),
         })
     }
-
-    fn into_column(self) -> i64 {
-        match self {
-            Kind::Bookmark => mozISyncedBookmarksMerger::KIND_BOOKMARK as i64,
-            Kind::Query => mozISyncedBookmarksMerger::KIND_QUERY as i64,
-            Kind::Folder => mozISyncedBookmarksMerger::KIND_FOLDER as i64,
-            Kind::Livemark => mozISyncedBookmarksMerger::KIND_LIVEMARK as i64,
-            Kind::Separator => mozISyncedBookmarksMerger::KIND_SEPARATOR as i64,
-        }
-    }
 }
 
 impl Column<i64> for Validity {
@@ -1254,14 +1243,6 @@ impl Column<i64> for Validity {
             _ => return Err(Error::UnknownItemValidity(raw).into()),
         })
     }
-
-    fn into_column(self) -> i64 {
-        match self {
-            Validity::Valid => mozISyncedBookmarksMerger::VALIDITY_VALID as i64,
-            Validity::Reupload => mozISyncedBookmarksMerger::VALIDITY_REUPLOAD as i64,
-            Validity::Replace => mozISyncedBookmarksMerger::VALIDITY_REPLACE as i64,
-        }
-    }
 }
 
 /// Formats an optional value so that it can be included in a SQL statement.