Skip to content

Commit 578f627

Browse files
committed
iterator: remove unused variants
These variants were moved to other enums.
1 parent bd3bce6 commit 578f627

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

scylla-rust-wrapper/src/iterator.rs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,8 @@ pub enum CassIterator<'result_or_schema> {
9292
CassSchemaMetaIterator(CassSchemaMetaIterator<'result_or_schema>),
9393
CassKeyspaceMetaTableIterator(CassKeyspaceMetaIterator<'result_or_schema>),
9494
CassKeyspaceMetaUserTypeIterator(CassKeyspaceMetaIterator<'result_or_schema>),
95-
CassKeyspaceMetaViewIterator(CassKeyspaceMetaIterator<'result_or_schema>),
9695
CassMaterializedViewsMetaIterator(CassMaterializedViewsMetaIterator<'result_or_schema>),
9796
CassColumnsMetaIterator(CassColumnsMetaIterator<'result_or_schema>),
98-
CassTableMetaIterator(CassTableMetaIterator<'result_or_schema>),
99-
CassViewMetaIterator(CassViewMetaIterator<'result_or_schema>),
10097
}
10198

10299
impl BoxFFI for CassIterator<'_> {}
@@ -127,17 +124,12 @@ pub unsafe extern "C" fn cass_iterator_type(iterator: *mut CassIterator) -> Cass
127124
CassIterator::CassKeyspaceMetaUserTypeIterator(_) => {
128125
CassIteratorType::CASS_ITERATOR_TYPE_TYPE_META
129126
}
130-
CassIterator::CassKeyspaceMetaViewIterator(_) => {
131-
CassIteratorType::CASS_ITERATOR_TYPE_MATERIALIZED_VIEW_META
132-
}
133127
CassIterator::CassMaterializedViewsMetaIterator(_) => {
134128
CassIteratorType::CASS_ITERATOR_TYPE_MATERIALIZED_VIEW_META
135129
}
136130
CassIterator::CassColumnsMetaIterator(_) => {
137131
CassIteratorType::CASS_ITERATOR_TYPE_COLUMN_META
138132
}
139-
CassIterator::CassTableMetaIterator(_) => CassIteratorType::CASS_ITERATOR_TYPE_COLUMN_META,
140-
CassIterator::CassViewMetaIterator(_) => CassIteratorType::CASS_ITERATOR_TYPE_COLUMN_META,
141133
}
142134
}
143135

@@ -219,8 +211,7 @@ pub unsafe extern "C" fn cass_iterator_next(iterator: *mut CassIterator) -> cass
219211
}
220212
CassIterator::CassMaterializedViewsMetaIterator(
221213
CassMaterializedViewsMetaIterator::FromKeyspace(keyspace_meta_iterator),
222-
)
223-
| CassIterator::CassKeyspaceMetaViewIterator(keyspace_meta_iterator) => {
214+
) => {
224215
let new_pos: usize = keyspace_meta_iterator
225216
.position
226217
.map_or(0, |prev_pos| prev_pos + 1);
@@ -234,16 +225,14 @@ pub unsafe extern "C" fn cass_iterator_next(iterator: *mut CassIterator) -> cass
234225
)
235226
| CassIterator::CassColumnsMetaIterator(CassColumnsMetaIterator::FromTable(
236227
table_iterator,
237-
))
238-
| CassIterator::CassTableMetaIterator(table_iterator) => {
228+
)) => {
239229
let new_pos: usize = table_iterator.position.map_or(0, |prev_pos| prev_pos + 1);
240230

241231
table_iterator.position = Some(new_pos);
242232

243233
(new_pos < table_iterator.count) as cass_bool_t
244234
}
245-
CassIterator::CassColumnsMetaIterator(CassColumnsMetaIterator::FromView(view_iterator))
246-
| CassIterator::CassViewMetaIterator(view_iterator) => {
235+
CassIterator::CassColumnsMetaIterator(CassColumnsMetaIterator::FromView(view_iterator)) => {
247236
let new_pos: usize = view_iterator.position.map_or(0, |prev_pos| prev_pos + 1);
248237

249238
view_iterator.position = Some(new_pos);

0 commit comments

Comments
 (0)