diff --git a/lib/src/modules/mod.rs b/lib/src/modules/mod.rs index 4259ac057..fb876c22b 100644 --- a/lib/src/modules/mod.rs +++ b/lib/src/modules/mod.rs @@ -332,6 +332,9 @@ pub mod mods { } /// Types that allow for module introspection. + /// + /// This API is unstable and not ready for public use. + #[doc(hidden)] pub mod reflect { use crate::modules::protos::yara::exts::field_options; use std::borrow::Cow; @@ -401,7 +404,7 @@ pub mod mods { } RuntimeType::Bool => FieldKind::Bool, RuntimeType::String => FieldKind::String, - RuntimeType::VecU8 => FieldKind::Bytes, + RuntimeType::VecU8 => FieldKind::String, RuntimeType::Enum(_) => FieldKind::Integer, RuntimeType::Message(m) => { FieldKind::Struct(Struct::new(m)) @@ -433,8 +436,6 @@ pub mod mods { Bool, /// A string. String, - /// A bytes sequence. - Bytes, /// A structure. Struct(Struct), /// An array. diff --git a/lib/src/modules/tests.rs b/lib/src/modules/tests.rs index 2ef375b2f..160079cec 100644 --- a/lib/src/modules/tests.rs +++ b/lib/src/modules/tests.rs @@ -371,19 +371,19 @@ fn test_reflect() { let field = fields.next().unwrap(); assert_eq!(field.name(), "bytes_foo"); - assert_eq!(field.kind(), FieldKind::Bytes); + assert_eq!(field.kind(), FieldKind::String); let field = fields.next().unwrap(); assert_eq!(field.name(), "bytes_bar"); - assert_eq!(field.kind(), FieldKind::Bytes); + assert_eq!(field.kind(), FieldKind::String); let field = fields.next().unwrap(); assert_eq!(field.name(), "bytes_raw"); - assert_eq!(field.kind(), FieldKind::Bytes); + assert_eq!(field.kind(), FieldKind::String); let field = fields.next().unwrap(); assert_eq!(field.name(), "bytes_undef"); - assert_eq!(field.kind(), FieldKind::Bytes); + assert_eq!(field.kind(), FieldKind::String); let field = fields.next().unwrap(); assert_eq!(field.name(), "enumeration"); diff --git a/ls/src/features/completion.rs b/ls/src/features/completion.rs index 84e3ad710..ae5196ac3 100644 --- a/ls/src/features/completion.rs +++ b/ls/src/features/completion.rs @@ -437,7 +437,6 @@ fn kind_to_string(k: &FieldKind) -> String { FieldKind::Float => "float".to_string(), FieldKind::Bool => "bool".to_string(), FieldKind::String => "string".to_string(), - FieldKind::Bytes => "bytes".to_string(), FieldKind::Struct(_) => "struct".to_string(), FieldKind::Array(inner) => format!("array<{}>", kind_to_string(inner)), FieldKind::Map(key, value) => { diff --git a/ls/src/tests/testdata/completion8.response.json b/ls/src/tests/testdata/completion8.response.json index 3bfe95290..a5648ab96 100644 --- a/ls/src/tests/testdata/completion8.response.json +++ b/ls/src/tests/testdata/completion8.response.json @@ -338,7 +338,7 @@ { "label": "pdb_path", "labelDetails": { - "description": "bytes" + "description": "string" }, "kind": 5 },