From d14e77ba488bd3a186712bbc09b213b52a8081d2 Mon Sep 17 00:00:00 2001 From: Arthur Baars Date: Tue, 24 Sep 2024 14:09:23 +0200 Subject: [PATCH] Address comments --- rust/extractor/src/main.rs | 2 +- rust/extractor/src/translate/.gitattributes | 1 + rust/extractor/src/translate/generated.rs | 2 ++ rust/generate-schema/src/main.rs | 7 ++++++- rust/schema/.gitattributes | 1 + rust/schema/ast.py | 2 ++ 6 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 rust/extractor/src/translate/.gitattributes create mode 100644 rust/schema/.gitattributes diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs index f7bcedfd8c2..0300e3c1f3b 100644 --- a/rust/extractor/src/main.rs +++ b/rust/extractor/src/main.rs @@ -9,7 +9,7 @@ pub mod trap; use ra_ap_syntax::ast::SourceFile; use ra_ap_syntax::AstNode; -pub fn extract( +fn extract( archiver: &archive::Archiver, traps: &trap::TrapFileProvider, file: std::path::PathBuf, diff --git a/rust/extractor/src/translate/.gitattributes b/rust/extractor/src/translate/.gitattributes new file mode 100644 index 00000000000..d408bf18300 --- /dev/null +++ b/rust/extractor/src/translate/.gitattributes @@ -0,0 +1 @@ +/generated.rs linguist-generated diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs index 5220599779b..561bfbb1f0d 100644 --- a/rust/extractor/src/translate/generated.rs +++ b/rust/extractor/src/translate/generated.rs @@ -1,3 +1,5 @@ +//! Generated by `cargo generate-schema`, do not edit by hand. + use super::base::{TextValue, Translator}; use crate::generated; use crate::trap::{Label, TrapId}; diff --git a/rust/generate-schema/src/main.rs b/rust/generate-schema/src/main.rs index 0e0424c66d3..956e2b1c042 100644 --- a/rust/generate-schema/src/main.rs +++ b/rust/generate-schema/src/main.rs @@ -53,6 +53,10 @@ fn write_schema( super_types: BTreeMap>, ) -> std::io::Result { let mut buf: Vec = Vec::new(); + writeln!( + buf, + "# Generated by `cargo generate-schema`, do not edit by hand.\n" + )?; writeln!(buf, "from .prelude import *\n")?; for node in &grammar.enums { @@ -404,7 +408,8 @@ fn write_extractor(grammar: &AstSrc) -> std::io::Result { let mut buf: Vec = Vec::new(); writeln!( buf, - "use crate::generated; + "//! Generated by `cargo generate-schema`, do not edit by hand.\n +use crate::generated; use super::base::{{TextValue, Translator}}; use crate::trap::{{Label, TrapId}}; use ra_ap_syntax::ast; diff --git a/rust/schema/.gitattributes b/rust/schema/.gitattributes new file mode 100644 index 00000000000..515346ca14c --- /dev/null +++ b/rust/schema/.gitattributes @@ -0,0 +1 @@ +/ast.py linguist-generated diff --git a/rust/schema/ast.py b/rust/schema/ast.py index 671f8947334..13eb54e7acf 100644 --- a/rust/schema/ast.py +++ b/rust/schema/ast.py @@ -1,3 +1,5 @@ +# Generated by `cargo generate-schema`, do not edit by hand. + from .prelude import * class AssocItem(AstNode):