Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 53 additions & 40 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 11 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,18 @@ multiple_crate_versions = "allow"

[workspace.dependencies]
# External oxc crates from crates.io
oxc_allocator = "0.124"
oxc_ast = "0.124"
oxc_ast_visit = "0.124"
oxc_diagnostics = "0.124"
oxc_napi = "0.124"
oxc_parser = "0.124"
oxc_semantic = "0.124"
oxc_span = "0.124"
oxc_allocator = "0.125"
oxc_ast = "0.125"
oxc_ast_visit = "0.125"
oxc_diagnostics = "0.125"
oxc_napi = "0.125"
oxc_parser = "0.125"
oxc_semantic = "0.125"
oxc_span = "0.125"
oxc_sourcemap = "6.0.1"
oxc_transformer = "0.124"
oxc_codegen = "0.124"
oxc_str = "0.125"
oxc_transformer = "0.125"
oxc_codegen = "0.125"

# Internal
oxc_angular_compiler = { path = "crates/oxc_angular_compiler" }
Expand Down
1 change: 1 addition & 0 deletions crates/angular_conformance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ oxc_ast = { workspace = true }
oxc_ast_visit = { workspace = true }
oxc_parser = { workspace = true }
oxc_span = { workspace = true }
oxc_str = { workspace = true }

pico-args = { workspace = true }
project-root = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/angular_conformance/src/extractor/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl SpecExtractor {
let parts: Vec<&str> = lit
.quasis
.iter()
.filter_map(|q| q.value.cooked.as_ref().map(oxc_span::Str::as_str))
.filter_map(|q| q.value.cooked.as_ref().map(oxc_str::Str::as_str))
.collect();
Some(parts.join(""))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ impl WhitespaceRemovingHumanizer {
for token in tokens {
match token.token_type {
InterpolatedTokenType::Text => {
let text = token.parts.first().map_or("", oxc_span::Ident::as_str);
let text = token.parts.first().map_or("", oxc_str::Ident::as_str);
let processed = process_whitespace(text);
result.push(vec![processed]);
}
Expand Down
1 change: 1 addition & 0 deletions crates/oxc_angular_compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ oxc_parser = { workspace = true }
oxc_semantic = { workspace = true }
oxc_span = { workspace = true }
oxc_sourcemap = { workspace = true }
oxc_str = { workspace = true }
oxc_transformer = { workspace = true }
oxc_codegen = { workspace = true }
miette = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion crates/oxc_angular_compiler/src/ast/expression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
//! - No bitwise operators

use oxc_allocator::{Allocator, Box, Vec};
use oxc_span::{Ident, Span};
use oxc_span::Span;
use oxc_str::Ident;

/// A span within the expression source.
#[derive(Debug, Clone, Copy)]
Expand Down
Loading
Loading