feat: upgrade to deno_ast 0.27 (#529)

Author: dsherret

Cargo.lock

@@ -26,7 +26,7 @@ tracing = ["dprint-core/tracing"]
 
 [dependencies]
 anyhow = "1.0.64"
-deno_ast = { version = "0.26.0", features = ["view"] }
+deno_ast = { version = "0.27.0", features = ["view"] }
 dprint-core = { version = "0.62.0", features = ["formatting"] }
 rustc-hash = "1.1.0"
 serde = { version = "1.0.144", features = ["derive"] }

Cargo.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.67.0"
+channel = "1.70.0"
 components = ["clippy"]

rust-toolchain.toml

@@ -8,13 +8,13 @@ use deno_ast::SourceRangedForSpanned;
 use deno_ast::SourceTextInfoProvider;
 
 pub struct CommentTracker<'a> {
-  program: &'a Program<'a>,
+  program: Program<'a>,
   tokens: &'a [TokenAndSpan],
   token_index: usize,
 }
 
 impl<'a> CommentTracker<'a> {
-  pub fn new(program: &'a Program<'a>, tokens: &'a [TokenAndSpan]) -> CommentTracker<'a> {
+  pub fn new(program: Program<'a>, tokens: &'a [TokenAndSpan]) -> CommentTracker<'a> {
     CommentTracker {
       program,
       tokens,

src/generation/comments.rs

@@ -20,7 +20,7 @@ use crate::utils::Stack;
 
 pub struct Context<'a> {
   pub media_type: MediaType,
-  pub program: &'a Program<'a>,
+  pub program: Program<'a>,
   pub config: &'a Configuration,
   pub comments: CommentTracker<'a>,
   pub token_finder: TokenFinder<'a>,
@@ -41,7 +41,7 @@ pub struct Context<'a> {
 }
 
 impl<'a> Context<'a> {
-  pub fn new(media_type: MediaType, tokens: &'a [TokenAndSpan], current_node: Node<'a>, program: &'a Program<'a>, config: &'a Configuration) -> Context<'a> {
+  pub fn new(media_type: MediaType, tokens: &'a [TokenAndSpan], current_node: Node<'a>, program: Program<'a>, config: &'a Configuration) -> Context<'a> {
     Context {
       media_type,
       program,
@@ -60,7 +60,7 @@ impl<'a> Context<'a> {
       if_stmt_last_brace_condition_ref: None,
       expr_stmt_single_line_parent_brace_ref: None,
       #[cfg(debug_assertions)]
-      last_generated_node_pos: deno_ast::SourceTextInfoProvider::text_info(program).range().start.into(),
+      last_generated_node_pos: deno_ast::SourceTextInfoProvider::text_info(&program).range().start.into(),
     }
   }
 
@@ -80,35 +80,35 @@ impl<'a> Context<'a> {
     self.handled_comments.insert(comment.start());
   }
 
-  pub fn store_info_range_for_node(&mut self, node: &dyn SourceRanged, lns: (LineNumber, LineNumber)) {
+  pub fn store_info_range_for_node(&mut self, node: &impl SourceRanged, lns: (LineNumber, LineNumber)) {
     self.stored_ln_ranges.insert((node.start(), node.end()), lns);
   }
 
-  pub fn get_ln_range_for_node(&self, node: &dyn SourceRanged) -> Option<(LineNumber, LineNumber)> {
+  pub fn get_ln_range_for_node(&self, node: &impl SourceRanged) -> Option<(LineNumber, LineNumber)> {
     self.stored_ln_ranges.get(&(node.start(), node.end())).map(|x| x.to_owned())
   }
 
-  pub fn store_lsil_for_node(&mut self, node: &dyn SourceRanged, lsil: LineStartIndentLevel) {
+  pub fn store_lsil_for_node(&mut self, node: &impl SourceRanged, lsil: LineStartIndentLevel) {
     self.stored_lsil.insert((node.start(), node.end()), lsil);
   }
 
-  pub fn get_lsil_for_node(&self, node: &dyn SourceRanged) -> Option<LineStartIndentLevel> {
+  pub fn get_lsil_for_node(&self, node: &impl SourceRanged) -> Option<LineStartIndentLevel> {
     self.stored_lsil.get(&(node.start(), node.end())).map(|x| x.to_owned())
   }
 
-  pub fn store_ln_for_node(&mut self, node: &dyn SourceRanged, ln: LineNumber) {
+  pub fn store_ln_for_node(&mut self, node: &impl SourceRanged, ln: LineNumber) {
     self.stored_ln.insert((node.start(), node.end()), ln);
   }
 
-  pub fn get_ln_for_node(&self, node: &dyn SourceRanged) -> Option<LineNumber> {
+  pub fn get_ln_for_node(&self, node: &impl SourceRanged) -> Option<LineNumber> {
     self.stored_ln.get(&(node.start(), node.end())).map(|x| x.to_owned())
   }
 
-  pub fn store_il_for_node(&mut self, node: &dyn SourceRanged, il: IndentLevel) {
+  pub fn store_il_for_node(&mut self, node: &impl SourceRanged, il: IndentLevel) {
     self.stored_il.insert((node.start(), node.end()), il);
   }
 
-  pub fn get_il_for_node(&self, node: &dyn SourceRanged) -> Option<IndentLevel> {
+  pub fn get_il_for_node(&self, node: &impl SourceRanged) -> Option<IndentLevel> {
     self.stored_il.get(&(node.start(), node.end())).map(|x| x.to_owned())
   }