Clean up public API leaks (#64)

* Clean up public API leaks

* Consolidate to single name for remote-tests

* Bump version too

Author: kaidokert

.github/workflows/build.yaml

@@ -102,15 +102,10 @@ jobs:
           fi
           echo "Found $(find picojson/tests/data/JSONTestSuite/test_parsing -name '*.json' | wc -l) conformance test files"
 
-      - name: Run JSONTestSuite conformance tests
+      - name: Run JSONTestSuite and JSON_checker conformance tests
         working-directory: picojson
         run: cargo test --features remote-tests
         continue-on-error: true
 
-      - name: Run JSON_checker conformance tests
-        working-directory: picojson
-        run: cargo test --features remote-tests,json-checker-tests
-        continue-on-error: true
-
       - name: Report conformance test results
         run: echo "::notice::All conformance tests completed - check logs above for any failures"

.gitignore

@@ -23,3 +23,6 @@ Cargo.lock
 
 # Downloaded conformance test files
 **/conformance_tests/
+picojson/tests/data/json_checker/
+picojson/tests/data/JSONTestSuite/
+picojson/tests/conformance_generated.rs

picojson/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "picojson"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 license = "Apache-2.0"
 exclude = ["/.github/**"]
@@ -33,12 +33,9 @@ float-skip = []         # Skip float values during parsing (continue with next t
 float-error = []        # Error when encountering floats
 float-truncate = []     # Truncate floats to integers (1.7 → 1)
 
-# Remote conformance testing
+# Remote conformance test suites
 remote-tests = ["dep:ureq", "dep:zip"]
 
-# JSON_checker test suite from json.org
-json-checker-tests = []
-
 [package.metadata.conformance-tests]
 # JSONTestSuite configuration
 jsontest-suite-url = "https://github.com/nst/JSONTestSuite/archive/{commit}.zip"

picojson/build.rs

@@ -177,7 +177,7 @@ fn get_jsontest_suite_commit() -> String {
         .unwrap_or_else(|_| "1ef36fa01286573e846ac449e8683f8833c5b26a".to_string())
 }
 
-#[cfg(feature = "json-checker-tests")]
+#[cfg(feature = "remote-tests")]
 fn get_json_checker_url() -> String {
     std::env::var("CARGO_PKG_METADATA_CONFORMANCE_TESTS_JSON_CHECKER_URL")
         .unwrap_or_else(|_| "https://www.json.org/JSON_checker/test.zip".to_string())
@@ -266,7 +266,7 @@ fn download_json_test_suite() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
-#[cfg(feature = "json-checker-tests")]
+#[cfg(feature = "remote-tests")]
 fn download_json_checker() -> Result<(), Box<dyn std::error::Error>> {
     use std::fs;
     use std::io::{self, Read};
@@ -344,7 +344,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         download_json_test_suite()?;
     }
 
-    #[cfg(feature = "json-checker-tests")]
+    #[cfg(feature = "remote-tests")]
     {
         download_json_checker()?;
     }
@@ -353,7 +353,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     #[cfg(feature = "remote-tests")]
     {
         generate_conformance_tests()?;
-        println!("cargo:warning=You can now run conformance tests with: cargo test --features remote-tests,json-checker-tests");
+        println!("cargo:warning=You can now run conformance tests with: cargo test --features remote-tests");
     }
 
     Ok(())

picojson/src/event_processor.rs

@@ -220,12 +220,6 @@ pub trait ContentExtractor {
         finished: bool,
     ) -> Result<Event<'_, '_>, ParseError>;
 
-    /// Check if the underlying source is finished (e.g., EOF for a stream).
-    /// The default is `true`, suitable for complete sources like slices.
-    fn is_finished(&self) -> bool {
-        true
-    }
-
     /// Shared validation and extraction for string content
     fn validate_and_extract_string(&mut self) -> Result<Event<'_, '_>, ParseError> {
         let start_pos = match *self.parser_state() {

picojson/src/lib.rs

@@ -80,7 +80,6 @@ mod shared;
 pub use shared::{Event, PullParser};
 
 mod event_processor;
-pub use event_processor::{EscapeTiming, ParserCore};
 
 mod slice_input_buffer;
 

picojson/src/slice_content_builder.rs

@@ -3,7 +3,7 @@
 //! ContentBuilder implementation for SliceParser using CopyOnEscape optimization.
 
 use crate::copy_on_escape::CopyOnEscape;
-use crate::escape_processor::UnicodeEscapeCollector;
+use crate::escape_processor::{self, UnicodeEscapeCollector};
 use crate::event_processor::ContentExtractor;
 use crate::shared::{ContentRange, State};
 use crate::slice_input_buffer::{InputBuffer, SliceInputBuffer};
@@ -124,7 +124,7 @@ impl ContentExtractor for SliceContentBuilder<'_, '_> {
         let had_pending_high_surrogate = self.unicode_escape_collector.has_pending_high_surrogate();
 
         let (utf8_bytes_result, escape_start_pos) =
-            crate::escape_processor::process_unicode_escape_sequence(
+            escape_processor::process_unicode_escape_sequence(
                 current_pos,
                 &mut self.unicode_escape_collector,
                 hex_slice_provider,

picojson/src/stream_content_builder.rs

@@ -259,10 +259,6 @@ impl<R: Reader> ContentExtractor for StreamContentBuilder<'_, R> {
         Ok(Event::Number(json_number))
     }
 
-    fn is_finished(&self) -> bool {
-        self.finished
-    }
-
     fn validate_and_extract_number(
         &mut self,
         from_container_end: bool,

picojson/tests/json_checker_tests.rs

@@ -12,7 +12,7 @@
 //! This provides complementary validation to JSONTestSuite with focused
 //! testing of specific JSON specification violations.
 
-#[cfg(feature = "json-checker-tests")]
+#[cfg(feature = "remote-tests")]
 mod json_checker_tests {
     use picojson::{Event, ParseError, PullParser, SliceParser};
     use std::fs;