language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

take &Path instead of PathBuf

Browse source
This commit is contained in:
Muhammad Mominul Huque 2018-10-16 15:36:53 +06:00
parent 9d9e637ef3
commit 2c4cfb297e
No known key found for this signature in database
GPG key ID: 9D472E8B36098956
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/tools/src/lib.rs
View file

@ -77,7 +77,7 @@ pub fn update(path: &Path, contents: &str, verify: bool) -> Result<()> {
Ok(()) Ok(())
} }
pub fn render_template(template: PathBuf) -> Result<String> { pub fn render_template(template: &Path) -> Result<String> {
let grammar: ron::value::Value = { let grammar: ron::value::Value = {
let text = fs::read_to_string(project_root().join(GRAMMAR))?; let text = fs::read_to_string(project_root().join(GRAMMAR))?;
ron::de::from_str(&text)? ron::de::from_str(&text)?

4
crates/tools/src/main.rs
View file

@ -40,8 +40,8 @@ fn main() -> Result<()> {
fn run_gen_command(name: &str, verify: bool) -> Result<()> { fn run_gen_command(name: &str, verify: bool) -> Result<()> {
match name { match name {
"gen-kinds" => { "gen-kinds" => {
update(&project_root().join(SYNTAX_KINDS), &render_template(project_root().join(SYNTAX_KINDS_TEMPLATE))?, verify)?; update(&project_root().join(SYNTAX_KINDS), &render_template(&project_root().join(SYNTAX_KINDS_TEMPLATE))?, verify)?;
update(&project_root().join(AST), &render_template(project_root().join(AST_TEMPLATE))?, verify)?; update(&project_root().join(AST), &render_template(&project_root().join(AST_TEMPLATE))?, verify)?;
}, },
"gen-tests" => { "gen-tests" => {
gen_tests(verify)? gen_tests(verify)?

4
crates/tools/tests/cli.rs
View file

@ -4,10 +4,10 @@ use tools::{AST, AST_TEMPLATE, SYNTAX_KINDS, SYNTAX_KINDS_TEMPLATE, render_templ
#[test] #[test]
fn verify_template_generation() { fn verify_template_generation() {
if let Err(error) = update(&project_root().join(SYNTAX_KINDS), &render_template(project_root().join(SYNTAX_KINDS_TEMPLATE)).unwrap(), true) { if let Err(error) = update(&project_root().join(SYNTAX_KINDS), &render_template(&project_root().join(SYNTAX_KINDS_TEMPLATE)).unwrap(), true) {
panic!("{}. Please update it by running `cargo gen-kinds`", error); panic!("{}. Please update it by running `cargo gen-kinds`", error);
} }
if let Err(error) = update(&project_root().join(AST), &render_template(project_root().join(AST_TEMPLATE)).unwrap(), true) { if let Err(error) = update(&project_root().join(AST), &render_template(&project_root().join(AST_TEMPLATE)).unwrap(), true) {
panic!("{}. Please update it by running `cargo gen-kinds`", error); panic!("{}. Please update it by running `cargo gen-kinds`", error);
} }
} }