From f9e8802234cbd692b1979cff3bea90f5103d4187 Mon Sep 17 00:00:00 2001 From: Andrew Hlynskyi Date: Thu, 17 Aug 2023 16:27:52 +0300 Subject: [PATCH] Use the same flags in lib's build.rs as in Makefile --- lib/binding_rust/build.rs | 4 +++- lib/src/subtree.c | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/binding_rust/build.rs b/lib/binding_rust/build.rs index 5798cde3..c812c3b9 100644 --- a/lib/binding_rust/build.rs +++ b/lib/binding_rust/build.rs @@ -26,7 +26,9 @@ fn main() { cc::Build::new() .flag_if_supported("-std=c99") - .flag_if_supported("-Wno-unused-parameter") + .flag_if_supported("-fvisibility=hidden") + .flag_if_supported("-Wshadow") + .flag_if_supported("-Werror") .include(src_path) .include("include") .file(src_path.join("lib.c")) diff --git a/lib/src/subtree.c b/lib/src/subtree.c index 5f39bd82..51bc2ef6 100644 --- a/lib/src/subtree.c +++ b/lib/src/subtree.c @@ -647,10 +647,10 @@ Subtree ts_subtree_edit(Subtree self, const TSInputEdit *input_edit, SubtreePool typedef struct { Subtree *tree; Edit edit; - } StackEntry; + } EditEntry; - Array(StackEntry) stack = array_new(); - array_push(&stack, ((StackEntry) { + Array(EditEntry) stack = array_new(); + array_push(&stack, ((EditEntry) { .tree = &self, .edit = (Edit) { .start = {input_edit->start_byte, input_edit->start_point}, @@ -660,7 +660,7 @@ Subtree ts_subtree_edit(Subtree self, const TSInputEdit *input_edit, SubtreePool })); while (stack.size) { - StackEntry entry = array_pop(&stack); + EditEntry entry = array_pop(&stack); Edit edit = entry.edit; bool is_noop = edit.old_end.bytes == edit.start.bytes && edit.new_end.bytes == edit.start.bytes; bool is_pure_insertion = edit.old_end.bytes == edit.start.bytes; @@ -788,7 +788,7 @@ Subtree ts_subtree_edit(Subtree self, const TSInputEdit *input_edit, SubtreePool } // Queue processing of this child's subtree. - array_push(&stack, ((StackEntry) { + array_push(&stack, ((EditEntry) { .tree = child, .edit = child_edit, }));