fix: fix issues with span

Something went wrong with the merges of changes from PR #3955 into `next` and this issue re-surfaced.
stacks-network · Dec 23, 2023 · 9884895 · 9884895
1 parent 88a068b
commit 9884895
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clarity/src/vm/ast/sugar_expander/mod.rs b/clarity/src/vm/ast/sugar_expander/mod.rs
@@ -89,10 +89,10 @@ impl SugarExpander {
                             let mut l = SymbolicExpression::list(pair.to_vec().into_boxed_slice());
                             if let (Some(first), Some(last)) = (pair.first(), pair.last()) {
                                 l.set_span(
-                                    first.span.start_line,
-                                    first.span.start_column,
-                                    last.span.end_line,
-                                    last.span.end_column,
+                                    first.span().start_line,
+                                    first.span().start_column,
+                                    last.span().end_line,
+                                    last.span().end_column,
                                 )
                             }
                             l
@@ -135,14 +135,14 @@ impl SugarExpander {
                 PreSymbolicExpressionType::Comment(comment) => {
                     if let Some(last_expr) = expressions.last_mut() {
                         // If this comment is on the same line as the last expression attach it
-                        if last_expr.span.end_line == pre_expr.span.start_line {
+                        if last_expr.span().end_line == pre_expr.span().start_line {
                             last_expr.end_line_comment = Some(comment);
                         } else {
                             // Else, attach it to the next expression
-                            comments.push((comment, pre_expr.span));
+                            comments.push((comment, pre_expr.span()));
                         }
                     } else {
-                        comments.push((comment, pre_expr.span));
+                        comments.push((comment, pre_expr.span()));
                     }
                     continue;
                 }

diff --git a/stacks-common/src/types/sqlite.rs b/stacks-common/src/types/sqlite.rs
@@ -1,5 +1,6 @@
 use rusqlite::types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef};
 
+use super::chainstate::VRFSeed;
 use crate::deps_common::bitcoin::util::hash::Sha256dHash;
 use crate::types::chainstate::{
     BlockHeaderHash, BurnchainHeaderHash, ConsensusHash, SortitionId, StacksBlockId, TrieHash,
@@ -8,8 +9,6 @@ use crate::util::hash::{Hash160, Sha512Trunc256Sum};
 use crate::util::secp256k1::{MessageSignature, SchnorrSignature};
 use crate::util::vrf::VRFProof;
 
-use super::chainstate::VRFSeed;
-
 impl FromSql for Sha256dHash {
     fn column_result(value: ValueRef) -> FromSqlResult<Sha256dHash> {
         let hex_str = value.as_str()?;