From fdb4953ea460d5c09ac73f3f37dd570d44893155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Sun, 5 Nov 2023 23:58:59 +0100
Subject: refactor: unify CDP types in a single module (#21094)

This commit moves all Chrome Devtools Protocol messages to `cli/cdp.rs`
and refactors all places using these types to pull them from a common
place.

No functional changes.
---
 cli/tools/coverage/range_tree.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'cli/tools/coverage/range_tree.rs')

diff --git a/cli/tools/coverage/range_tree.rs b/cli/tools/coverage/range_tree.rs
index c3bba7942..c873b2f8e 100644
--- a/cli/tools/coverage/range_tree.rs
+++ b/cli/tools/coverage/range_tree.rs
@@ -3,7 +3,7 @@
 // Forked from https://github.com/demurgos/v8-coverage/tree/d0ca18da8740198681e0bc68971b0a6cdb11db3e/rust
 // Copyright 2021 Charles Samborski. All rights reserved. MIT license.
 
-use super::json_types::CoverageRange;
+use crate::cdp;
 use std::iter::Peekable;
 use typed_arena::Arena;
 
@@ -126,12 +126,12 @@ impl<'rt> RangeTree<'rt> {
     tree
   }
 
-  pub fn to_ranges(&self) -> Vec<CoverageRange> {
-    let mut ranges: Vec<CoverageRange> = Vec::new();
+  pub fn to_ranges(&self) -> Vec<cdp::CoverageRange> {
+    let mut ranges: Vec<cdp::CoverageRange> = Vec::new();
     let mut stack: Vec<(&RangeTree, i64)> = vec![(self, 0)];
     while let Some((cur, parent_count)) = stack.pop() {
       let count: i64 = parent_count + cur.delta;
-      ranges.push(CoverageRange {
+      ranges.push(cdp::CoverageRange {
         start_char_offset: cur.start,
         end_char_offset: cur.end,
         count,
@@ -145,7 +145,7 @@ impl<'rt> RangeTree<'rt> {
 
   pub fn from_sorted_ranges<'a>(
     rta: &'a RangeTreeArena<'a>,
-    ranges: &[CoverageRange],
+    ranges: &[cdp::CoverageRange],
   ) -> Option<&'a mut RangeTree<'a>> {
     Self::from_sorted_ranges_inner(
       rta,
@@ -157,7 +157,7 @@ impl<'rt> RangeTree<'rt> {
 
   fn from_sorted_ranges_inner<'a, 'b, 'c: 'b>(
     rta: &'a RangeTreeArena<'a>,
-    ranges: &'b mut Peekable<impl Iterator<Item = &'c CoverageRange>>,
+    ranges: &'b mut Peekable<impl Iterator<Item = &'c cdp::CoverageRange>>,
     parent_end: usize,
     parent_count: i64,
   ) -> Option<&'a mut RangeTree<'a>> {
@@ -190,7 +190,7 @@ mod tests {
   #[test]
   fn from_sorted_ranges_empty() {
     let rta = RangeTreeArena::new();
-    let inputs: Vec<CoverageRange> = vec![CoverageRange {
+    let inputs: Vec<cdp::CoverageRange> = vec![cdp::CoverageRange {
       start_char_offset: 0,
       end_char_offset: 9,
       count: 1,
-- 
cgit v1.2.3