Deser macros: fully qualified syntax for "Option" and its variants

Macros need to use fully qualified paths in order to maintain hygiene.

Author: Lorak-mmk

scylla-macros/src/deserialize/value.rs

@@ -494,9 +494,11 @@ impl DeserializeAssumeOrderGenerator<'_> {
                 let maybe_next_cql_field = saved_cql_field
                     .take()
                     .map(::std::result::Result::Ok)
-                    .or_else(|| ::std::iter::Iterator::next(&mut cql_field_iter)
-                        .map(|(specs, value_res)| value_res.map(|value| (specs, value)))
-                    )
+                    .or_else(|| {
+                        ::std::option::Option::map(
+                            ::std::iter::Iterator::next(&mut cql_field_iter),
+                            |(specs, value_res)| value_res.map(|value| (specs, value)))
+                    })
                     .transpose()
                     // Propagate deserialization errors.
                     .map_err(|err| #macro_internal::mk_value_deser_err::<Self>(
@@ -507,7 +509,7 @@ impl DeserializeAssumeOrderGenerator<'_> {
                         }
                     ))?;
 
-                if let Some(next_cql_field) = maybe_next_cql_field {
+                if let ::std::option::Option::Some(next_cql_field) = maybe_next_cql_field {
                     let ((cql_field_name, cql_field_typ), value) = next_cql_field;
 
                     // The value can be either

scylla-macros/src/serialize/row.rs

@@ -345,7 +345,7 @@ impl Generator for ColumnOrderedGenerator<'_> {
             };
             statements.push(parse_quote! {
                 match ::std::iter::Iterator::next(&mut column_iter) {
-                    Some(spec) => {
+                    ::std::option::Option::Some(spec) => {
                         if #name_check_expression {
                             let cell_writer = #crate_path::RowWriter::make_cell_writer(writer);
                             match <#typ as #crate_path::SerializeValue>::serialize(&self.#rust_field_ident, spec.typ(), cell_writer) {
@@ -368,7 +368,7 @@ impl Generator for ColumnOrderedGenerator<'_> {
                             ));
                         }
                     }
-                    None => {
+                    ::std::option::Option::None => {
                         return ::std::result::Result::Err(mk_typck_err(
                             #crate_path::BuiltinRowTypeCheckErrorKind::ValueMissingForColumn {
                                 name: <_ as ::std::string::ToString>::to_string(#rust_field_name),
@@ -381,7 +381,7 @@ impl Generator for ColumnOrderedGenerator<'_> {
 
         // Check whether there are some columns remaining
         statements.push(parse_quote! {
-            if let Some(spec) = ::std::iter::Iterator::next(&mut column_iter) {
+            if let ::std::option::Option::Some(spec) = ::std::iter::Iterator::next(&mut column_iter) {
                 return ::std::result::Result::Err(mk_typck_err(
                     #crate_path::BuiltinRowTypeCheckErrorKind::NoColumnWithName {
                         name: <_ as ::std::borrow::ToOwned>::to_owned(spec.name()),

scylla-macros/src/serialize/value.rs

@@ -488,7 +488,7 @@ impl Generator for FieldOrderedGenerator<'_> {
             };
             statements.push(parse_quote! {
                 match field_iter.peek() {
-                    Some((field_name, typ)) => {
+                    ::std::option::Option::Some((field_name, typ)) => {
                         if #name_check_expression {
                             // Advance the iterator.
                             ::std::iter::Iterator::next(&mut field_iter);
@@ -515,7 +515,7 @@ impl Generator for FieldOrderedGenerator<'_> {
                         }
                         // Else simply ignore the field.
                     }
-                    None => {
+                    ::std::option::Option::None => {
                         if !#field_can_be_ignored {
                             return ::std::result::Result::Err(mk_typck_err(
                                 #crate_path::UdtTypeCheckErrorKind::ValueMissingForUdtField {
@@ -532,7 +532,7 @@ impl Generator for FieldOrderedGenerator<'_> {
         if self.ctx.attributes.forbid_excess_udt_fields {
             // Check whether there are some fields remaining
             statements.push(parse_quote! {
-                if let Some((field_name, typ)) = ::std::iter::Iterator::next(&mut field_iter) {
+                if let ::std::option::Option::Some((field_name, typ)) = ::std::iter::Iterator::next(&mut field_iter) {
                     return ::std::result::Result::Err(mk_typck_err(
                         #crate_path::UdtTypeCheckErrorKind::NoSuchFieldInUdt {
                             field_name: <_ as ::std::clone::Clone>::clone(field_name).into_owned(),