fix rebase

Author: Michu1596

scylla/src/response/query_result.rs

@@ -7,79 +7,9 @@ use scylla_cql::deserialize::result::TypedRowIterator;
 use scylla_cql::deserialize::row::DeserializeRow;
 use scylla_cql::deserialize::{DeserializationError, TypeCheckError};
 use scylla_cql::frame::frame_errors::ResultMetadataAndRowsCountParseError;
-use scylla_cql::frame::response::result::{
-    ColumnSpec, ColumnType, DeserializedMetadataAndRawRows, RawMetadataAndRawRows, TableSpec,
-};
-
-#[allow(deprecated)]
+use scylla_cql::frame::response::result::{ColumnSpec, DeserializedMetadataAndRawRows, RawMetadataAndRawRows};
 #[cfg(feature = "result-displayer")]
-use super::rows_displayer::RowsDisplayer;
-
-/// A view over specification of a table in the database.
-#[derive(Debug, Clone, Copy)]
-#[cfg_attr(test, derive(PartialEq, Eq))]
-pub struct TableSpecView<'res> {
-    table_name: &'res str,
-    ks_name: &'res str,
-}
-
-impl<'res> TableSpecView<'res> {
-    pub(crate) fn new_from_table_spec(spec: &'res TableSpec) -> Self {
-        Self {
-            table_name: spec.table_name(),
-            ks_name: spec.ks_name(),
-        }
-    }
-
-    /// The name of the table.
-    #[inline]
-    pub fn table_name(&self) -> &'res str {
-        self.table_name
-    }
-
-    /// The name of the keyspace the table resides in.
-    #[inline]
-    pub fn ks_name(&self) -> &'res str {
-        self.ks_name
-    }
-}
-
-/// A view over specification of a column returned by the database.
-#[derive(Debug, Clone, Copy)]
-#[cfg_attr(test, derive(PartialEq, Eq))]
-pub struct ColumnSpecView<'res> {
-    table_spec: TableSpecView<'res>,
-    name: &'res str,
-    typ: &'res ColumnType<'res>,
-}
-
-impl<'res> ColumnSpecView<'res> {
-    pub(crate) fn new_from_column_spec(spec: &'res ColumnSpec) -> Self {
-        Self {
-            table_spec: TableSpecView::new_from_table_spec(spec.table_spec()),
-            name: spec.name(),
-            typ: spec.typ(),
-        }
-    }
-
-    /// Returns a view over specification of the table the column is part of.
-    #[inline]
-    pub fn table_spec(&self) -> TableSpecView<'res> {
-        self.table_spec
-    }
-
-    /// The column's name.
-    #[inline]
-    pub fn name(&self) -> &'res str {
-        self.name
-    }
-
-    /// The column's CQL type.
-    #[inline]
-    pub fn typ(&self) -> &'res ColumnType {
-        self.typ
-    }
-}
+use crate::response::rows_displayer::RowsDisplayer;
 
 /// A view over specification of columns returned by the database.
 #[derive(Debug, Clone, Copy)]