cleanup

Author: sbdchd

.gitattributes

@@ -0,0 +1,2 @@
+crates/squawk_parser/src/generated/* linguist-generated=true
+crates/squawk_syntax/src/ast/generated/* linguist-generated=true

crates/xtask/src/keywords.rs

@@ -1,4 +1,4 @@
-use crate::path_util::cwd_to_workspace_root;
+use crate::path::project_root;
 use anyhow::{Context, Ok, Result};
 use enum_iterator::{all, Sequence};
 use std::collections::{HashMap, HashSet};
@@ -75,9 +75,8 @@ fn keyword_allowed(cat: KeywordCategory, kw_type: KWType) -> bool {
 }
 
 fn parse_header() -> Result<HashMap<String, KeywordMeta>> {
-    cwd_to_workspace_root().context("Failed to cwd to root")?;
-
-    let data = std::fs::read_to_string("postgres/kwlist.h").context("Failed to read kwlist.h")?;
+    let kwlist_file = project_root().join("postgres/kwlist.h");
+    let data = std::fs::read_to_string(kwlist_file).context("Failed to read kwlist.h")?;
 
     let mut keywords = HashMap::new();
 

crates/xtask/src/main.rs

@@ -10,7 +10,6 @@ mod download_regression_tests;
 mod keywords;
 mod new_rule;
 mod path;
-mod path_util;
 mod sync_kwlist;
 
 #[derive(Subcommand, Debug)]

crates/xtask/src/path_util.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use reqwest::header::USER_AGENT;
 use serde::Deserialize;
 
@@ -10,7 +10,7 @@ pub(crate) fn sync_kwlist() -> Result<()> {
 use std::fs;
 use std::io::Write;
 
-use crate::path_util::cwd_to_workspace_root;
+use crate::path::project_root;
 
 #[derive(Deserialize, Debug)]
 struct CommitResponse {
@@ -46,8 +46,6 @@ fn latest_pg_git_sha() -> Result<()> {
 
     let file_content = file_response.text()?;
 
-    cwd_to_workspace_root().context("Failed to cwd to root")?;
-
     let preamble = format!(
         r"// synced from: 
 //   commit: {}
@@ -62,7 +60,8 @@ fn latest_pg_git_sha() -> Result<()> {
     )
     .to_owned();
 
-    let mut file = fs::File::create("postgres/kwlist.h")?;
+    let kwlist_file = project_root().join("postgres/kwlist.h");
+    let mut file = fs::File::create(kwlist_file)?;
     file.write_all((preamble + &file_content).as_bytes())?;
 
     Ok(())