Skip to content

refactor(ast_tools): remove repeated code in Output methods #6953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Oct 28, 2024
Merged

refactor(ast_tools): remove repeated code in Output methods #6953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions tasks/ast_tools/src/output/javascript.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ pub fn print_javascript(code: &str, generator_path: &str) -> String {

/// Creates a generated file warning + required information for a generated file.
fn generate_header(generator_path: &str) -> String {
let generator_path = generator_path.replace('\\', "/");

// TODO: Add generation date, AST source hash, etc here.
format!(
"// Auto-generated code, DO NOT EDIT DIRECTLY!\n\
Expand Down
8 changes: 5 additions & 3 deletions tasks/ast_tools/src/output/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,19 @@ pub enum Output {

impl Output {
pub fn into_raw(self, generator_path: &str) -> RawOutput {
let generator_path = generator_path.replace('\\', "/");

let (path, code) = match self {
Self::Rust { path, tokens } => {
let code = print_rust(&tokens, generator_path);
let code = print_rust(&tokens, &generator_path);
(path, code)
}
Self::Javascript { path, code } => {
let code = print_javascript(&code, generator_path);
let code = print_javascript(&code, &generator_path);
(path, code)
}
Self::Yaml { path, code } => {
let code = print_yaml(&code, generator_path);
let code = print_yaml(&code, &generator_path);
(path, code)
}
Self::Raw { path, code } => (path, code),
Expand Down
2 changes: 0 additions & 2 deletions tasks/ast_tools/src/output/rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ pub fn print_rust(tokens: &TokenStream, generator_path: &str) -> String {

/// Creates a generated file warning + required information for a generated file.
fn generate_header(generator_path: &str) -> TokenStream {
let generator_path = generator_path.replace('\\', "/");

// TODO: Add generation date, AST source hash, etc here.
let edit_comment = format!("@ To edit this generated file you have to edit `{generator_path}`");
quote! {
Expand Down
2 changes: 0 additions & 2 deletions tasks/ast_tools/src/output/yaml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ pub fn print_yaml(code: &str, generator_path: &str) -> String {

/// Creates a generated file warning + required information for a generated file.
fn generate_header(generator_path: &str) -> String {
let generator_path = generator_path.replace('\\', "/");

// TODO: Add generation date, AST source hash, etc here.
format!(
"# Auto-generated code, DO NOT EDIT DIRECTLY!\n\
Expand Down