From b27b4665ac076873d6c0e27a6009d8b10fb5d264 Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Sun, 5 Dec 2021 20:25:29 -0800 Subject: [PATCH] test: fix incorrect uses of i8 instead of c_char Fixes build on aarch64, ppc64le and other platforms that have c_char defined as u8. --- cli/src/tests/highlight_test.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/cli/src/tests/highlight_test.rs b/cli/src/tests/highlight_test.rs index 6b09d64c..e0b356d2 100644 --- a/cli/src/tests/highlight_test.rs +++ b/cli/src/tests/highlight_test.rs @@ -1,6 +1,7 @@ use super::helpers::fixtures::{get_highlight_config, get_language, get_language_queries_path}; use lazy_static::lazy_static; use std::ffi::CString; +use std::os::raw::c_char; use std::sync::atomic::{AtomicUsize, Ordering}; use std::{fs, ptr, slice, str}; use tree_sitter_highlight::{ @@ -489,15 +490,15 @@ fn test_highlighting_via_c_api() { ]; let highlight_names = highlights .iter() - .map(|h| h["class=".len()..].as_ptr() as *const i8) + .map(|h| h["class=".len()..].as_ptr() as *const c_char) .collect::>(); let highlight_attrs = highlights .iter() - .map(|h| h.as_bytes().as_ptr() as *const i8) + .map(|h| h.as_bytes().as_ptr() as *const c_char) .collect::>(); let highlighter = c::ts_highlighter_new( - &highlight_names[0] as *const *const i8, - &highlight_attrs[0] as *const *const i8, + &highlight_names[0] as *const *const c_char, + &highlight_attrs[0] as *const *const c_char, highlights.len() as u32, ); @@ -515,9 +516,9 @@ fn test_highlighting_via_c_api() { js_scope.as_ptr(), js_injection_regex.as_ptr(), language, - highlights_query.as_ptr() as *const i8, - injections_query.as_ptr() as *const i8, - locals_query.as_ptr() as *const i8, + highlights_query.as_ptr() as *const c_char, + injections_query.as_ptr() as *const c_char, + locals_query.as_ptr() as *const c_char, highlights_query.len() as u32, injections_query.len() as u32, locals_query.len() as u32, @@ -534,8 +535,8 @@ fn test_highlighting_via_c_api() { html_scope.as_ptr(), html_injection_regex.as_ptr(), language, - highlights_query.as_ptr() as *const i8, - injections_query.as_ptr() as *const i8, + highlights_query.as_ptr() as *const c_char, + injections_query.as_ptr() as *const c_char, ptr::null(), highlights_query.len() as u32, injections_query.len() as u32,