Skip to content

Commit b8af251

Browse files
fix: resolve rustfmt formatting issues across workspace
1 parent 8b56808 commit b8af251

6 files changed

Lines changed: 59 additions & 32 deletions

File tree

crates/cli/src/main.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -646,11 +646,7 @@ fn cmd_encode(file: Option<PathBuf>, json: bool) -> Result<(), CliError> {
646646
serde_json::from_str(&input).map_err(|e| CliError::parse(format!("invalid JSON: {e}")))?;
647647
let decoded: srcmap_codec::SourceMapMappings = raw
648648
.into_iter()
649-
.map(|line| {
650-
line.into_iter()
651-
.map(srcmap_codec::Segment::from)
652-
.collect()
653-
})
649+
.map(|line| line.into_iter().map(srcmap_codec::Segment::from).collect())
654650
.collect();
655651
let encoded = encode(&decoded);
656652

crates/codec/src/lib.rs

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,10 @@ impl From<Vec<i64>> for Segment {
161161
let mut data = [0i64; 5];
162162
let len = v.len().min(5);
163163
data[..len].copy_from_slice(&v[..len]);
164-
Self { data, len: len as u8 }
164+
Self {
165+
data,
166+
len: len as u8,
167+
}
165168
}
166169
}
167170

@@ -170,7 +173,10 @@ impl From<&[i64]> for Segment {
170173
let mut data = [0i64; 5];
171174
let len = s.len().min(5);
172175
data[..len].copy_from_slice(&s[..len]);
173-
Self { data, len: len as u8 }
176+
Self {
177+
data,
178+
len: len as u8,
179+
}
174180
}
175181
}
176182

@@ -251,7 +257,10 @@ mod tests {
251257

252258
#[test]
253259
fn roundtrip_negative_deltas() {
254-
let mappings = vec![vec![Segment::four(10, 0, 10, 10), Segment::four(20, 0, 5, 5)]];
260+
let mappings = vec![vec![
261+
Segment::four(10, 0, 10, 10),
262+
Segment::four(20, 0, 5, 5),
263+
]];
255264
let encoded = encode(&mappings);
256265
let decoded = decode(&encoded).unwrap();
257266
assert_eq!(decoded, mappings);
@@ -379,14 +388,22 @@ mod tests {
379388
fn encode_empty_segments_no_dangling_comma() {
380389
// Empty segments should be skipped without producing dangling commas
381390
let empty = Segment::from(&[] as &[i64]);
382-
let mappings = vec![vec![empty, Segment::four(0, 0, 0, 0), empty, Segment::four(2, 0, 0, 1)]];
391+
let mappings = vec![vec![
392+
empty,
393+
Segment::four(0, 0, 0, 0),
394+
empty,
395+
Segment::four(2, 0, 0, 1),
396+
]];
383397
let encoded = encode(&mappings);
384398
assert!(
385399
!encoded.contains(",,"),
386400
"should not contain dangling commas"
387401
);
388402
// Should encode as if empty segments don't exist
389-
let expected = encode(&vec![vec![Segment::four(0, 0, 0, 0), Segment::four(2, 0, 0, 1)]]);
403+
let expected = encode(&vec![vec![
404+
Segment::four(0, 0, 0, 0),
405+
Segment::four(2, 0, 0, 1),
406+
]]);
390407
assert_eq!(encoded, expected);
391408
}
392409

crates/generator/src/lib.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,10 @@ impl SourceMapGenerator {
364364
fn encode_parallel_impl(sorted: &[&Mapping]) -> String {
365365
use rayon::prelude::*;
366366

367-
let max_line = sorted.last().expect("encode_parallel_impl requires non-empty sorted slice").generated_line as usize;
367+
let max_line = sorted
368+
.last()
369+
.expect("encode_parallel_impl requires non-empty sorted slice")
370+
.generated_line as usize;
368371

369372
// Build line ranges: (start_idx, end_idx) into sorted slice
370373
let mut line_ranges: Vec<(usize, usize)> = vec![(0, 0); max_line + 1];
@@ -1136,7 +1139,9 @@ impl StreamingGenerator {
11361139
/// Panics if the internal VLQ-encoded mappings string is corrupted or
11371140
/// contains invalid VLQ sequences. This is not expected under normal use,
11381141
/// since the streaming encoder always produces valid output.
1139-
pub fn to_decoded_map(&self) -> Result<srcmap_sourcemap::SourceMap, srcmap_sourcemap::ParseError> {
1142+
pub fn to_decoded_map(
1143+
&self,
1144+
) -> Result<srcmap_sourcemap::SourceMap, srcmap_sourcemap::ParseError> {
11401145
let vlq = self.vlq_string();
11411146
let range_mappings = self.encode_range_mappings();
11421147

crates/remapping/src/lib.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,7 @@ impl ConcatBuilder {
9898
.collect();
9999

100100
// Remap names (add_name deduplicates internally)
101-
let name_indices: Vec<u32> = sm
102-
.names
103-
.iter()
104-
.map(|n| self.builder.add_name(n))
105-
.collect();
101+
let name_indices: Vec<u32> = sm.names.iter().map(|n| self.builder.add_name(n)).collect();
106102

107103
// Copy ignore_list entries
108104
for &ignored in &sm.ignore_list {
@@ -594,7 +590,9 @@ where
594590
}
595591
}
596592

597-
builder.to_decoded_map().expect("streaming VLQ should be valid")
593+
builder
594+
.to_decoded_map()
595+
.expect("streaming VLQ should be valid")
598596
}
599597

600598
// ── Tests ─────────────────────────────────────────────────────────

crates/scopes/src/decode.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,11 @@ pub fn decode_scopes(
220220
source_idx += 1;
221221
} else {
222222
// Safe: just checked !is_empty()
223-
scope_stack.last_mut().expect("non-empty: checked above").children.push(finished);
223+
scope_stack
224+
.last_mut()
225+
.expect("non-empty: checked above")
226+
.children
227+
.push(finished);
224228
}
225229
}
226230

@@ -341,7 +345,11 @@ pub fn decode_scopes(
341345
ranges.push(finished);
342346
} else {
343347
// Safe: just checked !is_empty()
344-
range_stack.last_mut().expect("non-empty: checked above").children.push(finished);
348+
range_stack
349+
.last_mut()
350+
.expect("non-empty: checked above")
351+
.children
352+
.push(finished);
345353
}
346354
}
347355

crates/sourcemap/src/lib.rs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,11 @@ impl SourceMap {
344344
// Decode scopes if present
345345
let num_sources = sources.len();
346346
let scopes = match raw.scopes {
347-
Some(scopes_str) if !scopes_str.is_empty() => Some(
348-
srcmap_scopes::decode_scopes(scopes_str, &raw.names, num_sources)
349-
?,
350-
),
347+
Some(scopes_str) if !scopes_str.is_empty() => Some(srcmap_scopes::decode_scopes(
348+
scopes_str,
349+
&raw.names,
350+
num_sources,
351+
)?),
351352
_ => None,
352353
};
353354

@@ -1130,10 +1131,11 @@ impl SourceMap {
11301131
// Decode scopes if present
11311132
let num_sources = sources.len();
11321133
let scopes = match raw.scopes {
1133-
Some(scopes_str) if !scopes_str.is_empty() => Some(
1134-
srcmap_scopes::decode_scopes(scopes_str, &raw.names, num_sources)
1135-
?,
1136-
),
1134+
Some(scopes_str) if !scopes_str.is_empty() => Some(srcmap_scopes::decode_scopes(
1135+
scopes_str,
1136+
&raw.names,
1137+
num_sources,
1138+
)?),
11371139
_ => None,
11381140
};
11391141

@@ -1363,10 +1365,11 @@ impl LazySourceMap {
13631365
// Decode scopes if present
13641366
let num_sources = sources.len();
13651367
let scopes = match raw.scopes {
1366-
Some(scopes_str) if !scopes_str.is_empty() => Some(
1367-
srcmap_scopes::decode_scopes(scopes_str, &raw.names, num_sources)
1368-
?,
1369-
),
1368+
Some(scopes_str) if !scopes_str.is_empty() => Some(srcmap_scopes::decode_scopes(
1369+
scopes_str,
1370+
&raw.names,
1371+
num_sources,
1372+
)?),
13701373
_ => None,
13711374
};
13721375

0 commit comments

Comments
 (0)