From 0419585bd2ae631fc06b216d6bfdd825990fcee2 Mon Sep 17 00:00:00 2001 From: Joshua Thijssen Date: Thu, 22 Feb 2024 11:29:21 +0100 Subject: [PATCH] Changed crate paths to underscore --- .gitignore | 4 +- CONTRIBUTING.md | 2 +- Cargo.lock | 58 +++++++++---------- Cargo.toml | 18 +++--- crates/gosub-bindings/Cargo.toml | 14 ----- .../.gitignore | 0 crates/gosub_bindings/Cargo.toml | 14 +++++ .../Makefile | 0 .../README.md | 0 .../include/gosub_api.h | 0 .../include/nodes.h | 0 .../include/nodes/text.h | 0 .../include/properties.h | 0 .../src/gosub_api.c | 0 .../src/lib.rs | 0 .../src/nodes.c | 0 .../src/nodes/text.c | 0 .../src/wrapper.rs | 0 .../src/wrapper/node.rs | 0 .../src/wrapper/text.rs | 0 .../tests/rendertree_test.c | 0 .../{gosub-config => gosub_config}/Cargo.toml | 2 +- .../src/errors.rs | 0 .../{gosub-config => gosub_config}/src/lib.rs | 0 .../src/settings.json | 0 .../src/settings.rs | 0 .../src/storage.rs | 0 .../src/storage/json.rs | 0 .../src/storage/memory.rs | 0 .../src/storage/sqlite.rs | 0 crates/{gosub-css3 => gosub_css3}/Cargo.toml | 2 +- crates/{gosub-css3 => gosub_css3}/src/lib.rs | 0 .../src/location.rs | 0 crates/{gosub-css3 => gosub_css3}/src/node.rs | 0 .../{gosub-css3 => gosub_css3}/src/parser.rs | 0 .../src/parser/anplusb.rs | 0 .../src/parser/at_rule.rs | 0 .../src/parser/at_rule/container.rs | 0 .../src/parser/at_rule/font_face.rs | 0 .../src/parser/at_rule/import.rs | 0 .../src/parser/at_rule/layer.rs | 0 .../src/parser/at_rule/media.rs | 0 .../src/parser/at_rule/nest.rs | 0 .../src/parser/at_rule/page.rs | 0 .../src/parser/at_rule/scope.rs | 0 .../src/parser/at_rule/starting_style.rs | 0 .../src/parser/at_rule/supports.rs | 0 .../src/parser/block.rs | 0 .../src/parser/calc.rs | 0 .../src/parser/combinator.rs | 0 .../src/parser/condition.rs | 0 .../src/parser/declaration.rs | 0 .../src/parser/feature_function.rs | 0 .../src/parser/function.rs | 0 .../src/parser/operator.rs | 0 .../src/parser/pseudo.rs | 0 .../src/parser/rule.rs | 0 .../src/parser/selector.rs | 0 .../src/parser/selector_list.rs | 0 .../src/parser/stylesheet.rs | 0 .../src/parser/url.rs | 0 .../src/parser/value.rs | 0 .../src/parser_config.rs | 0 .../src/tokenizer.rs | 0 .../{gosub-css3 => gosub_css3}/src/unicode.rs | 0 .../{gosub-css3 => gosub_css3}/src/walker.rs | 0 .../{gosub-html5 => gosub_html5}/Cargo.toml | 2 +- .../{gosub-html5 => gosub_html5}/src/dom.rs | 0 .../src/element_class.rs | 0 .../src/error_logger.rs | 0 .../src/errors.rs | 0 .../{gosub-html5 => gosub_html5}/src/lib.rs | 0 .../{gosub-html5 => gosub_html5}/src/node.rs | 0 .../src/node/arena.rs | 0 .../src/node/data.rs | 0 .../src/node/data/comment.rs | 0 .../src/node/data/doctype.rs | 0 .../src/node/data/document.rs | 0 .../src/node/data/element.rs | 0 .../src/node/data/text.rs | 0 .../src/parser.rs | 0 .../src/parser/attr_replacements.rs | 0 .../src/parser/document.rs | 0 .../src/parser/helper.rs | 0 .../src/parser/query.rs | 0 .../src/parser/quirks.rs | 0 .../src/parser/tree_builder.rs | 0 .../src/tokenizer.rs | 0 .../src/tokenizer/character_reference.rs | 0 .../src/tokenizer/replacement_tables.rs | 0 .../src/tokenizer/results.md | 0 .../src/tokenizer/state.rs | 0 .../src/tokenizer/token.rs | 0 .../{gosub-html5 => gosub_html5}/src/util.rs | 0 .../{gosub-jsapi => gosub_jsapi}/Cargo.toml | 2 +- .../src/console.rs | 0 .../src/console/buffer.rs | 0 .../src/console/formatter.rs | 0 .../src/console/writable_printer.rs | 0 .../{gosub-jsapi => gosub_jsapi}/src/lib.rs | 0 crates/{gosub-net => gosub_net}/Cargo.toml | 4 +- crates/{gosub-net => gosub_net}/src/dns.rs | 0 .../{gosub-net => gosub_net}/src/dns/cache.rs | 0 .../{gosub-net => gosub_net}/src/dns/local.rs | 0 .../src/dns/remote.rs | 0 crates/{gosub-net => gosub_net}/src/errors.rs | 0 crates/{gosub-net => gosub_net}/src/http.rs | 0 .../src/http/headers.rs | 0 .../src/http/request.rs | 0 .../src/http/response.rs | 0 crates/{gosub-net => gosub_net}/src/lib.rs | 0 .../Cargo.toml | 2 +- .../src/lib.rs | 0 .../src/render_tree.rs | 0 .../src/render_tree/properties.rs | 0 .../src/render_tree/text.rs | 0 .../src/render_tree/util.rs | 0 .../{gosub-shared => gosub_shared}/Cargo.toml | 0 .../src/byte_stream.rs | 0 .../src/bytes.rs | 0 .../{gosub-shared => gosub_shared}/src/lib.rs | 0 .../src/timing.rs | 0 .../src/types.rs | 0 .../Cargo.toml | 4 +- .../src/lib.rs | 0 .../src/testing.rs | 0 .../src/testing/tokenizer.rs | 0 .../src/testing/tree_construction.rs | 0 .../src/testing/tree_construction/fixture.rs | 0 .../testing/tree_construction/generator.rs | 0 .../src/testing/tree_construction/parser.rs | 0 .../src/testing/tree_construction/result.rs | 0 .../Cargo.toml | 2 +- .../src/js.rs | 0 .../src/js/compile.rs | 0 .../src/js/context.rs | 0 .../src/js/function.rs | 0 .../src/js/interop.rs | 0 .../src/js/object.rs | 0 .../src/js/runtime.rs | 0 .../src/js/v8.rs | 0 .../src/js/v8/array.rs | 0 .../src/js/v8/compile.rs | 0 .../src/js/v8/context.rs | 0 .../src/js/v8/function.rs | 0 .../src/js/v8/object.rs | 0 .../src/js/v8/value.rs | 0 .../src/js/value.rs | 0 .../src/js/value_conversion.rs | 0 .../src/lib.rs | 0 .../src/test.rs | 0 151 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 crates/gosub-bindings/Cargo.toml rename crates/{gosub-bindings => gosub_bindings}/.gitignore (100%) create mode 100644 crates/gosub_bindings/Cargo.toml rename crates/{gosub-bindings => gosub_bindings}/Makefile (100%) rename crates/{gosub-bindings => gosub_bindings}/README.md (100%) rename crates/{gosub-bindings => gosub_bindings}/include/gosub_api.h (100%) rename crates/{gosub-bindings => gosub_bindings}/include/nodes.h (100%) rename crates/{gosub-bindings => gosub_bindings}/include/nodes/text.h (100%) rename crates/{gosub-bindings => gosub_bindings}/include/properties.h (100%) rename crates/{gosub-bindings => gosub_bindings}/src/gosub_api.c (100%) rename crates/{gosub-bindings => gosub_bindings}/src/lib.rs (100%) rename crates/{gosub-bindings => gosub_bindings}/src/nodes.c (100%) rename crates/{gosub-bindings => gosub_bindings}/src/nodes/text.c (100%) rename crates/{gosub-bindings => gosub_bindings}/src/wrapper.rs (100%) rename crates/{gosub-bindings => gosub_bindings}/src/wrapper/node.rs (100%) rename crates/{gosub-bindings => gosub_bindings}/src/wrapper/text.rs (100%) rename crates/{gosub-bindings => gosub_bindings}/tests/rendertree_test.c (100%) rename crates/{gosub-config => gosub_config}/Cargo.toml (86%) rename crates/{gosub-config => gosub_config}/src/errors.rs (100%) rename crates/{gosub-config => gosub_config}/src/lib.rs (100%) rename crates/{gosub-config => gosub_config}/src/settings.json (100%) rename crates/{gosub-config => gosub_config}/src/settings.rs (100%) rename crates/{gosub-config => gosub_config}/src/storage.rs (100%) rename crates/{gosub-config => gosub_config}/src/storage/json.rs (100%) rename crates/{gosub-config => gosub_config}/src/storage/memory.rs (100%) rename crates/{gosub-config => gosub_config}/src/storage/sqlite.rs (100%) rename crates/{gosub-css3 => gosub_css3}/Cargo.toml (77%) rename crates/{gosub-css3 => gosub_css3}/src/lib.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/location.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/node.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/anplusb.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule/container.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule/font_face.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule/import.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule/layer.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule/media.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule/nest.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule/page.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule/scope.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule/starting_style.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/at_rule/supports.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/block.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/calc.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/combinator.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/condition.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/declaration.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/feature_function.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/function.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/operator.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/pseudo.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/rule.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/selector.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/selector_list.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/stylesheet.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/url.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser/value.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/parser_config.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/tokenizer.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/unicode.rs (100%) rename crates/{gosub-css3 => gosub_css3}/src/walker.rs (100%) rename crates/{gosub-html5 => gosub_html5}/Cargo.toml (81%) rename crates/{gosub-html5 => gosub_html5}/src/dom.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/element_class.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/error_logger.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/errors.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/lib.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/node.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/node/arena.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/node/data.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/node/data/comment.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/node/data/doctype.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/node/data/document.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/node/data/element.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/node/data/text.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/parser.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/parser/attr_replacements.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/parser/document.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/parser/helper.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/parser/query.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/parser/quirks.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/parser/tree_builder.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/tokenizer.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/tokenizer/character_reference.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/tokenizer/replacement_tables.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/tokenizer/results.md (100%) rename crates/{gosub-html5 => gosub_html5}/src/tokenizer/state.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/tokenizer/token.rs (100%) rename crates/{gosub-html5 => gosub_html5}/src/util.rs (100%) rename crates/{gosub-jsapi => gosub_jsapi}/Cargo.toml (77%) rename crates/{gosub-jsapi => gosub_jsapi}/src/console.rs (100%) rename crates/{gosub-jsapi => gosub_jsapi}/src/console/buffer.rs (100%) rename crates/{gosub-jsapi => gosub_jsapi}/src/console/formatter.rs (100%) rename crates/{gosub-jsapi => gosub_jsapi}/src/console/writable_printer.rs (100%) rename crates/{gosub-jsapi => gosub_jsapi}/src/lib.rs (100%) rename crates/{gosub-net => gosub_net}/Cargo.toml (77%) rename crates/{gosub-net => gosub_net}/src/dns.rs (100%) rename crates/{gosub-net => gosub_net}/src/dns/cache.rs (100%) rename crates/{gosub-net => gosub_net}/src/dns/local.rs (100%) rename crates/{gosub-net => gosub_net}/src/dns/remote.rs (100%) rename crates/{gosub-net => gosub_net}/src/errors.rs (100%) rename crates/{gosub-net => gosub_net}/src/http.rs (100%) rename crates/{gosub-net => gosub_net}/src/http/headers.rs (100%) rename crates/{gosub-net => gosub_net}/src/http/request.rs (100%) rename crates/{gosub-net => gosub_net}/src/http/response.rs (100%) rename crates/{gosub-net => gosub_net}/src/lib.rs (100%) rename crates/{gosub-rendering => gosub_rendering}/Cargo.toml (77%) rename crates/{gosub-rendering => gosub_rendering}/src/lib.rs (100%) rename crates/{gosub-rendering => gosub_rendering}/src/render_tree.rs (100%) rename crates/{gosub-rendering => gosub_rendering}/src/render_tree/properties.rs (100%) rename crates/{gosub-rendering => gosub_rendering}/src/render_tree/text.rs (100%) rename crates/{gosub-rendering => gosub_rendering}/src/render_tree/util.rs (100%) rename crates/{gosub-shared => gosub_shared}/Cargo.toml (100%) rename crates/{gosub-shared => gosub_shared}/src/byte_stream.rs (100%) rename crates/{gosub-shared => gosub_shared}/src/bytes.rs (100%) rename crates/{gosub-shared => gosub_shared}/src/lib.rs (100%) rename crates/{gosub-shared => gosub_shared}/src/timing.rs (100%) rename crates/{gosub-shared => gosub_shared}/src/types.rs (100%) rename crates/{gosub-testing => gosub_testing}/Cargo.toml (80%) rename crates/{gosub-testing => gosub_testing}/src/lib.rs (100%) rename crates/{gosub-testing => gosub_testing}/src/testing.rs (100%) rename crates/{gosub-testing => gosub_testing}/src/testing/tokenizer.rs (100%) rename crates/{gosub-testing => gosub_testing}/src/testing/tree_construction.rs (100%) rename crates/{gosub-testing => gosub_testing}/src/testing/tree_construction/fixture.rs (100%) rename crates/{gosub-testing => gosub_testing}/src/testing/tree_construction/generator.rs (100%) rename crates/{gosub-testing => gosub_testing}/src/testing/tree_construction/parser.rs (100%) rename crates/{gosub-testing => gosub_testing}/src/testing/tree_construction/result.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/Cargo.toml (85%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/compile.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/context.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/function.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/interop.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/object.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/runtime.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/v8.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/v8/array.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/v8/compile.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/v8/context.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/v8/function.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/v8/object.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/v8/value.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/value.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/js/value_conversion.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/lib.rs (100%) rename crates/{gosub-webexecutor => gosub_webexecutor}/src/test.rs (100%) diff --git a/.gitignore b/.gitignore index d316b22ce..c7a968a96 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,6 @@ local/ settings.db # C API tests (ignore everything but source files) -*/gosub-bindings/tests/* -!*/gosub-bindings/tests/*.c +*/gosub_bindings/tests/* +!*/gosub_bindings/tests/*.c *.dSYM diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 473df6c2e..f32aa34b2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,7 +39,7 @@ In the root directory, run `make format` to have clippy automatically fix some o In the root directory, run `make bench` to run the benchmarks. ### Building C API Bindings -In the `crates/gosub-bindings` directory, run `make bindings` to build the C static libraries. For more information on this, see the [README](crates/gosub-bindings/README.md). +In the `crates/gosub_bindings` directory, run `make bindings` to build the C static libraries. For more information on this, see the [README](crates/gosub-bindings/README.md). Can also run `make test` in the same directory to build and run the tests for the C bindings. diff --git a/Cargo.lock b/Cargo.lock index a640e74b3..3c7c3e77f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -638,7 +638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] -name = "gosub-bindings" +name = "gosub_bindings" version = "0.1.0" dependencies = [ "gosub_html5", @@ -646,34 +646,6 @@ dependencies = [ "gosub_shared", ] -[[package]] -name = "gosub-engine" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap", - "cookie", - "criterion", - "derive_more", - "gosub_config", - "gosub_css3", - "gosub_html5", - "gosub_jsapi", - "gosub_net", - "gosub_shared", - "gosub_testing", - "gosub_webexecutor", - "lazy_static", - "regex", - "serde", - "serde_derive", - "simple_logger", - "test-case", - "ureq", - "url", - "walkdir", -] - [[package]] name = "gosub_config" version = "0.1.0" @@ -703,6 +675,34 @@ dependencies = [ "simple_logger", ] +[[package]] +name = "gosub_engine" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "cookie", + "criterion", + "derive_more", + "gosub_config", + "gosub_css3", + "gosub_html5", + "gosub_jsapi", + "gosub_net", + "gosub_shared", + "gosub_testing", + "gosub_webexecutor", + "lazy_static", + "regex", + "serde", + "serde_derive", + "simple_logger", + "test-case", + "ureq", + "url", + "walkdir", +] + [[package]] name = "gosub_html5" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 80716d2b4..bfd1c3277 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "gosub-engine" +name = "gosub_engine" version = "0.1.0" edition = "2021" rust-version = "1.73" @@ -39,14 +39,14 @@ name = "tree_iterator" harness = false [dependencies] -gosub_shared = { path = "./crates/gosub-shared", features = [] } -gosub_net = { path = "./crates/gosub-net", features = [] } -gosub_config = { path = "./crates/gosub-config", features = [] } -gosub_html5 = { path = "./crates/gosub-html5", features = [] } -gosub_css3 = { path = "./crates/gosub-css3", features = [] } -gosub_webexecutor = { path = "./crates/gosub-webexecutor", features = [] } -gosub_jsapi = { path = "./crates/gosub-jsapi", features = [] } -gosub_testing = { path = "./crates/gosub-testing", features = [] } +gosub_shared = { path = "./crates/gosub_shared", features = [] } +gosub_net = { path = "./crates/gosub_net", features = [] } +gosub_config = { path = "./crates/gosub_config", features = [] } +gosub_html5 = { path = "./crates/gosub_html5", features = [] } +gosub_css3 = { path = "./crates/gosub_css3", features = [] } +gosub_webexecutor = { path = "./crates/gosub_webexecutor", features = [] } +gosub_jsapi = { path = "./crates/gosub_jsapi", features = [] } +gosub_testing = { path = "./crates/gosub_testing", features = [] } serde = { version = "1.0", features = ["derive"] } serde_derive = "1.0" derive_more = "0.99" diff --git a/crates/gosub-bindings/Cargo.toml b/crates/gosub-bindings/Cargo.toml deleted file mode 100644 index 802c37a52..000000000 --- a/crates/gosub-bindings/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "gosub-bindings" -version = "0.1.0" -edition = "2021" -authors = ["Gosub Community "] -license = "MIT" - -[dependencies] -gosub_shared = { path = "../gosub-shared" } -gosub_rendering = { path = "../gosub-rendering" } -gosub_html5 = { path = "../gosub-html5" } - -[lib] -crate-type = ["staticlib"] diff --git a/crates/gosub-bindings/.gitignore b/crates/gosub_bindings/.gitignore similarity index 100% rename from crates/gosub-bindings/.gitignore rename to crates/gosub_bindings/.gitignore diff --git a/crates/gosub_bindings/Cargo.toml b/crates/gosub_bindings/Cargo.toml new file mode 100644 index 000000000..2d5382204 --- /dev/null +++ b/crates/gosub_bindings/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "gosub_bindings" +version = "0.1.0" +edition = "2021" +authors = ["Gosub Community "] +license = "MIT" + +[dependencies] +gosub_shared = { path = "../gosub_shared" } +gosub_rendering = { path = "../gosub_rendering" } +gosub_html5 = { path = "../gosub_html5" } + +[lib] +crate-type = ["staticlib"] diff --git a/crates/gosub-bindings/Makefile b/crates/gosub_bindings/Makefile similarity index 100% rename from crates/gosub-bindings/Makefile rename to crates/gosub_bindings/Makefile diff --git a/crates/gosub-bindings/README.md b/crates/gosub_bindings/README.md similarity index 100% rename from crates/gosub-bindings/README.md rename to crates/gosub_bindings/README.md diff --git a/crates/gosub-bindings/include/gosub_api.h b/crates/gosub_bindings/include/gosub_api.h similarity index 100% rename from crates/gosub-bindings/include/gosub_api.h rename to crates/gosub_bindings/include/gosub_api.h diff --git a/crates/gosub-bindings/include/nodes.h b/crates/gosub_bindings/include/nodes.h similarity index 100% rename from crates/gosub-bindings/include/nodes.h rename to crates/gosub_bindings/include/nodes.h diff --git a/crates/gosub-bindings/include/nodes/text.h b/crates/gosub_bindings/include/nodes/text.h similarity index 100% rename from crates/gosub-bindings/include/nodes/text.h rename to crates/gosub_bindings/include/nodes/text.h diff --git a/crates/gosub-bindings/include/properties.h b/crates/gosub_bindings/include/properties.h similarity index 100% rename from crates/gosub-bindings/include/properties.h rename to crates/gosub_bindings/include/properties.h diff --git a/crates/gosub-bindings/src/gosub_api.c b/crates/gosub_bindings/src/gosub_api.c similarity index 100% rename from crates/gosub-bindings/src/gosub_api.c rename to crates/gosub_bindings/src/gosub_api.c diff --git a/crates/gosub-bindings/src/lib.rs b/crates/gosub_bindings/src/lib.rs similarity index 100% rename from crates/gosub-bindings/src/lib.rs rename to crates/gosub_bindings/src/lib.rs diff --git a/crates/gosub-bindings/src/nodes.c b/crates/gosub_bindings/src/nodes.c similarity index 100% rename from crates/gosub-bindings/src/nodes.c rename to crates/gosub_bindings/src/nodes.c diff --git a/crates/gosub-bindings/src/nodes/text.c b/crates/gosub_bindings/src/nodes/text.c similarity index 100% rename from crates/gosub-bindings/src/nodes/text.c rename to crates/gosub_bindings/src/nodes/text.c diff --git a/crates/gosub-bindings/src/wrapper.rs b/crates/gosub_bindings/src/wrapper.rs similarity index 100% rename from crates/gosub-bindings/src/wrapper.rs rename to crates/gosub_bindings/src/wrapper.rs diff --git a/crates/gosub-bindings/src/wrapper/node.rs b/crates/gosub_bindings/src/wrapper/node.rs similarity index 100% rename from crates/gosub-bindings/src/wrapper/node.rs rename to crates/gosub_bindings/src/wrapper/node.rs diff --git a/crates/gosub-bindings/src/wrapper/text.rs b/crates/gosub_bindings/src/wrapper/text.rs similarity index 100% rename from crates/gosub-bindings/src/wrapper/text.rs rename to crates/gosub_bindings/src/wrapper/text.rs diff --git a/crates/gosub-bindings/tests/rendertree_test.c b/crates/gosub_bindings/tests/rendertree_test.c similarity index 100% rename from crates/gosub-bindings/tests/rendertree_test.c rename to crates/gosub_bindings/tests/rendertree_test.c diff --git a/crates/gosub-config/Cargo.toml b/crates/gosub_config/Cargo.toml similarity index 86% rename from crates/gosub-config/Cargo.toml rename to crates/gosub_config/Cargo.toml index e5d5711cb..895c180be 100644 --- a/crates/gosub-config/Cargo.toml +++ b/crates/gosub_config/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -gosub_shared = { path = "../gosub-shared", features = [] } +gosub_shared = { path = "../gosub_shared", features = [] } serde = { version = "1.0", features = ["derive"] } serde_json = {version = "1.0", features = ["preserve_order"]} serde_derive = "1.0" diff --git a/crates/gosub-config/src/errors.rs b/crates/gosub_config/src/errors.rs similarity index 100% rename from crates/gosub-config/src/errors.rs rename to crates/gosub_config/src/errors.rs diff --git a/crates/gosub-config/src/lib.rs b/crates/gosub_config/src/lib.rs similarity index 100% rename from crates/gosub-config/src/lib.rs rename to crates/gosub_config/src/lib.rs diff --git a/crates/gosub-config/src/settings.json b/crates/gosub_config/src/settings.json similarity index 100% rename from crates/gosub-config/src/settings.json rename to crates/gosub_config/src/settings.json diff --git a/crates/gosub-config/src/settings.rs b/crates/gosub_config/src/settings.rs similarity index 100% rename from crates/gosub-config/src/settings.rs rename to crates/gosub_config/src/settings.rs diff --git a/crates/gosub-config/src/storage.rs b/crates/gosub_config/src/storage.rs similarity index 100% rename from crates/gosub-config/src/storage.rs rename to crates/gosub_config/src/storage.rs diff --git a/crates/gosub-config/src/storage/json.rs b/crates/gosub_config/src/storage/json.rs similarity index 100% rename from crates/gosub-config/src/storage/json.rs rename to crates/gosub_config/src/storage/json.rs diff --git a/crates/gosub-config/src/storage/memory.rs b/crates/gosub_config/src/storage/memory.rs similarity index 100% rename from crates/gosub-config/src/storage/memory.rs rename to crates/gosub_config/src/storage/memory.rs diff --git a/crates/gosub-config/src/storage/sqlite.rs b/crates/gosub_config/src/storage/sqlite.rs similarity index 100% rename from crates/gosub-config/src/storage/sqlite.rs rename to crates/gosub_config/src/storage/sqlite.rs diff --git a/crates/gosub-css3/Cargo.toml b/crates/gosub_css3/Cargo.toml similarity index 77% rename from crates/gosub-css3/Cargo.toml rename to crates/gosub_css3/Cargo.toml index 0ef23447c..4c75d7f19 100644 --- a/crates/gosub-css3/Cargo.toml +++ b/crates/gosub_css3/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Gosub Community "] license = "MIT" [dependencies] -gosub_shared = { path = "../gosub-shared", features = [] } +gosub_shared = { path = "../gosub_shared", features = [] } lazy_static = "1.4" log = "0.4.20" simple_logger = "4.2.0" diff --git a/crates/gosub-css3/src/lib.rs b/crates/gosub_css3/src/lib.rs similarity index 100% rename from crates/gosub-css3/src/lib.rs rename to crates/gosub_css3/src/lib.rs diff --git a/crates/gosub-css3/src/location.rs b/crates/gosub_css3/src/location.rs similarity index 100% rename from crates/gosub-css3/src/location.rs rename to crates/gosub_css3/src/location.rs diff --git a/crates/gosub-css3/src/node.rs b/crates/gosub_css3/src/node.rs similarity index 100% rename from crates/gosub-css3/src/node.rs rename to crates/gosub_css3/src/node.rs diff --git a/crates/gosub-css3/src/parser.rs b/crates/gosub_css3/src/parser.rs similarity index 100% rename from crates/gosub-css3/src/parser.rs rename to crates/gosub_css3/src/parser.rs diff --git a/crates/gosub-css3/src/parser/anplusb.rs b/crates/gosub_css3/src/parser/anplusb.rs similarity index 100% rename from crates/gosub-css3/src/parser/anplusb.rs rename to crates/gosub_css3/src/parser/anplusb.rs diff --git a/crates/gosub-css3/src/parser/at_rule.rs b/crates/gosub_css3/src/parser/at_rule.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule.rs rename to crates/gosub_css3/src/parser/at_rule.rs diff --git a/crates/gosub-css3/src/parser/at_rule/container.rs b/crates/gosub_css3/src/parser/at_rule/container.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule/container.rs rename to crates/gosub_css3/src/parser/at_rule/container.rs diff --git a/crates/gosub-css3/src/parser/at_rule/font_face.rs b/crates/gosub_css3/src/parser/at_rule/font_face.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule/font_face.rs rename to crates/gosub_css3/src/parser/at_rule/font_face.rs diff --git a/crates/gosub-css3/src/parser/at_rule/import.rs b/crates/gosub_css3/src/parser/at_rule/import.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule/import.rs rename to crates/gosub_css3/src/parser/at_rule/import.rs diff --git a/crates/gosub-css3/src/parser/at_rule/layer.rs b/crates/gosub_css3/src/parser/at_rule/layer.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule/layer.rs rename to crates/gosub_css3/src/parser/at_rule/layer.rs diff --git a/crates/gosub-css3/src/parser/at_rule/media.rs b/crates/gosub_css3/src/parser/at_rule/media.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule/media.rs rename to crates/gosub_css3/src/parser/at_rule/media.rs diff --git a/crates/gosub-css3/src/parser/at_rule/nest.rs b/crates/gosub_css3/src/parser/at_rule/nest.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule/nest.rs rename to crates/gosub_css3/src/parser/at_rule/nest.rs diff --git a/crates/gosub-css3/src/parser/at_rule/page.rs b/crates/gosub_css3/src/parser/at_rule/page.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule/page.rs rename to crates/gosub_css3/src/parser/at_rule/page.rs diff --git a/crates/gosub-css3/src/parser/at_rule/scope.rs b/crates/gosub_css3/src/parser/at_rule/scope.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule/scope.rs rename to crates/gosub_css3/src/parser/at_rule/scope.rs diff --git a/crates/gosub-css3/src/parser/at_rule/starting_style.rs b/crates/gosub_css3/src/parser/at_rule/starting_style.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule/starting_style.rs rename to crates/gosub_css3/src/parser/at_rule/starting_style.rs diff --git a/crates/gosub-css3/src/parser/at_rule/supports.rs b/crates/gosub_css3/src/parser/at_rule/supports.rs similarity index 100% rename from crates/gosub-css3/src/parser/at_rule/supports.rs rename to crates/gosub_css3/src/parser/at_rule/supports.rs diff --git a/crates/gosub-css3/src/parser/block.rs b/crates/gosub_css3/src/parser/block.rs similarity index 100% rename from crates/gosub-css3/src/parser/block.rs rename to crates/gosub_css3/src/parser/block.rs diff --git a/crates/gosub-css3/src/parser/calc.rs b/crates/gosub_css3/src/parser/calc.rs similarity index 100% rename from crates/gosub-css3/src/parser/calc.rs rename to crates/gosub_css3/src/parser/calc.rs diff --git a/crates/gosub-css3/src/parser/combinator.rs b/crates/gosub_css3/src/parser/combinator.rs similarity index 100% rename from crates/gosub-css3/src/parser/combinator.rs rename to crates/gosub_css3/src/parser/combinator.rs diff --git a/crates/gosub-css3/src/parser/condition.rs b/crates/gosub_css3/src/parser/condition.rs similarity index 100% rename from crates/gosub-css3/src/parser/condition.rs rename to crates/gosub_css3/src/parser/condition.rs diff --git a/crates/gosub-css3/src/parser/declaration.rs b/crates/gosub_css3/src/parser/declaration.rs similarity index 100% rename from crates/gosub-css3/src/parser/declaration.rs rename to crates/gosub_css3/src/parser/declaration.rs diff --git a/crates/gosub-css3/src/parser/feature_function.rs b/crates/gosub_css3/src/parser/feature_function.rs similarity index 100% rename from crates/gosub-css3/src/parser/feature_function.rs rename to crates/gosub_css3/src/parser/feature_function.rs diff --git a/crates/gosub-css3/src/parser/function.rs b/crates/gosub_css3/src/parser/function.rs similarity index 100% rename from crates/gosub-css3/src/parser/function.rs rename to crates/gosub_css3/src/parser/function.rs diff --git a/crates/gosub-css3/src/parser/operator.rs b/crates/gosub_css3/src/parser/operator.rs similarity index 100% rename from crates/gosub-css3/src/parser/operator.rs rename to crates/gosub_css3/src/parser/operator.rs diff --git a/crates/gosub-css3/src/parser/pseudo.rs b/crates/gosub_css3/src/parser/pseudo.rs similarity index 100% rename from crates/gosub-css3/src/parser/pseudo.rs rename to crates/gosub_css3/src/parser/pseudo.rs diff --git a/crates/gosub-css3/src/parser/rule.rs b/crates/gosub_css3/src/parser/rule.rs similarity index 100% rename from crates/gosub-css3/src/parser/rule.rs rename to crates/gosub_css3/src/parser/rule.rs diff --git a/crates/gosub-css3/src/parser/selector.rs b/crates/gosub_css3/src/parser/selector.rs similarity index 100% rename from crates/gosub-css3/src/parser/selector.rs rename to crates/gosub_css3/src/parser/selector.rs diff --git a/crates/gosub-css3/src/parser/selector_list.rs b/crates/gosub_css3/src/parser/selector_list.rs similarity index 100% rename from crates/gosub-css3/src/parser/selector_list.rs rename to crates/gosub_css3/src/parser/selector_list.rs diff --git a/crates/gosub-css3/src/parser/stylesheet.rs b/crates/gosub_css3/src/parser/stylesheet.rs similarity index 100% rename from crates/gosub-css3/src/parser/stylesheet.rs rename to crates/gosub_css3/src/parser/stylesheet.rs diff --git a/crates/gosub-css3/src/parser/url.rs b/crates/gosub_css3/src/parser/url.rs similarity index 100% rename from crates/gosub-css3/src/parser/url.rs rename to crates/gosub_css3/src/parser/url.rs diff --git a/crates/gosub-css3/src/parser/value.rs b/crates/gosub_css3/src/parser/value.rs similarity index 100% rename from crates/gosub-css3/src/parser/value.rs rename to crates/gosub_css3/src/parser/value.rs diff --git a/crates/gosub-css3/src/parser_config.rs b/crates/gosub_css3/src/parser_config.rs similarity index 100% rename from crates/gosub-css3/src/parser_config.rs rename to crates/gosub_css3/src/parser_config.rs diff --git a/crates/gosub-css3/src/tokenizer.rs b/crates/gosub_css3/src/tokenizer.rs similarity index 100% rename from crates/gosub-css3/src/tokenizer.rs rename to crates/gosub_css3/src/tokenizer.rs diff --git a/crates/gosub-css3/src/unicode.rs b/crates/gosub_css3/src/unicode.rs similarity index 100% rename from crates/gosub-css3/src/unicode.rs rename to crates/gosub_css3/src/unicode.rs diff --git a/crates/gosub-css3/src/walker.rs b/crates/gosub_css3/src/walker.rs similarity index 100% rename from crates/gosub-css3/src/walker.rs rename to crates/gosub_css3/src/walker.rs diff --git a/crates/gosub-html5/Cargo.toml b/crates/gosub_html5/Cargo.toml similarity index 81% rename from crates/gosub-html5/Cargo.toml rename to crates/gosub_html5/Cargo.toml index 93a3082ef..16f8ca216 100644 --- a/crates/gosub-html5/Cargo.toml +++ b/crates/gosub_html5/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Gosub Community "] license = "MIT" [dependencies] -gosub_shared = { path = "../gosub-shared", features = [] } +gosub_shared = { path = "../gosub_shared", features = [] } derive_more = "0.99" phf = { version = "0.11.2", features = ["macros"] } lazy_static = "1.4" diff --git a/crates/gosub-html5/src/dom.rs b/crates/gosub_html5/src/dom.rs similarity index 100% rename from crates/gosub-html5/src/dom.rs rename to crates/gosub_html5/src/dom.rs diff --git a/crates/gosub-html5/src/element_class.rs b/crates/gosub_html5/src/element_class.rs similarity index 100% rename from crates/gosub-html5/src/element_class.rs rename to crates/gosub_html5/src/element_class.rs diff --git a/crates/gosub-html5/src/error_logger.rs b/crates/gosub_html5/src/error_logger.rs similarity index 100% rename from crates/gosub-html5/src/error_logger.rs rename to crates/gosub_html5/src/error_logger.rs diff --git a/crates/gosub-html5/src/errors.rs b/crates/gosub_html5/src/errors.rs similarity index 100% rename from crates/gosub-html5/src/errors.rs rename to crates/gosub_html5/src/errors.rs diff --git a/crates/gosub-html5/src/lib.rs b/crates/gosub_html5/src/lib.rs similarity index 100% rename from crates/gosub-html5/src/lib.rs rename to crates/gosub_html5/src/lib.rs diff --git a/crates/gosub-html5/src/node.rs b/crates/gosub_html5/src/node.rs similarity index 100% rename from crates/gosub-html5/src/node.rs rename to crates/gosub_html5/src/node.rs diff --git a/crates/gosub-html5/src/node/arena.rs b/crates/gosub_html5/src/node/arena.rs similarity index 100% rename from crates/gosub-html5/src/node/arena.rs rename to crates/gosub_html5/src/node/arena.rs diff --git a/crates/gosub-html5/src/node/data.rs b/crates/gosub_html5/src/node/data.rs similarity index 100% rename from crates/gosub-html5/src/node/data.rs rename to crates/gosub_html5/src/node/data.rs diff --git a/crates/gosub-html5/src/node/data/comment.rs b/crates/gosub_html5/src/node/data/comment.rs similarity index 100% rename from crates/gosub-html5/src/node/data/comment.rs rename to crates/gosub_html5/src/node/data/comment.rs diff --git a/crates/gosub-html5/src/node/data/doctype.rs b/crates/gosub_html5/src/node/data/doctype.rs similarity index 100% rename from crates/gosub-html5/src/node/data/doctype.rs rename to crates/gosub_html5/src/node/data/doctype.rs diff --git a/crates/gosub-html5/src/node/data/document.rs b/crates/gosub_html5/src/node/data/document.rs similarity index 100% rename from crates/gosub-html5/src/node/data/document.rs rename to crates/gosub_html5/src/node/data/document.rs diff --git a/crates/gosub-html5/src/node/data/element.rs b/crates/gosub_html5/src/node/data/element.rs similarity index 100% rename from crates/gosub-html5/src/node/data/element.rs rename to crates/gosub_html5/src/node/data/element.rs diff --git a/crates/gosub-html5/src/node/data/text.rs b/crates/gosub_html5/src/node/data/text.rs similarity index 100% rename from crates/gosub-html5/src/node/data/text.rs rename to crates/gosub_html5/src/node/data/text.rs diff --git a/crates/gosub-html5/src/parser.rs b/crates/gosub_html5/src/parser.rs similarity index 100% rename from crates/gosub-html5/src/parser.rs rename to crates/gosub_html5/src/parser.rs diff --git a/crates/gosub-html5/src/parser/attr_replacements.rs b/crates/gosub_html5/src/parser/attr_replacements.rs similarity index 100% rename from crates/gosub-html5/src/parser/attr_replacements.rs rename to crates/gosub_html5/src/parser/attr_replacements.rs diff --git a/crates/gosub-html5/src/parser/document.rs b/crates/gosub_html5/src/parser/document.rs similarity index 100% rename from crates/gosub-html5/src/parser/document.rs rename to crates/gosub_html5/src/parser/document.rs diff --git a/crates/gosub-html5/src/parser/helper.rs b/crates/gosub_html5/src/parser/helper.rs similarity index 100% rename from crates/gosub-html5/src/parser/helper.rs rename to crates/gosub_html5/src/parser/helper.rs diff --git a/crates/gosub-html5/src/parser/query.rs b/crates/gosub_html5/src/parser/query.rs similarity index 100% rename from crates/gosub-html5/src/parser/query.rs rename to crates/gosub_html5/src/parser/query.rs diff --git a/crates/gosub-html5/src/parser/quirks.rs b/crates/gosub_html5/src/parser/quirks.rs similarity index 100% rename from crates/gosub-html5/src/parser/quirks.rs rename to crates/gosub_html5/src/parser/quirks.rs diff --git a/crates/gosub-html5/src/parser/tree_builder.rs b/crates/gosub_html5/src/parser/tree_builder.rs similarity index 100% rename from crates/gosub-html5/src/parser/tree_builder.rs rename to crates/gosub_html5/src/parser/tree_builder.rs diff --git a/crates/gosub-html5/src/tokenizer.rs b/crates/gosub_html5/src/tokenizer.rs similarity index 100% rename from crates/gosub-html5/src/tokenizer.rs rename to crates/gosub_html5/src/tokenizer.rs diff --git a/crates/gosub-html5/src/tokenizer/character_reference.rs b/crates/gosub_html5/src/tokenizer/character_reference.rs similarity index 100% rename from crates/gosub-html5/src/tokenizer/character_reference.rs rename to crates/gosub_html5/src/tokenizer/character_reference.rs diff --git a/crates/gosub-html5/src/tokenizer/replacement_tables.rs b/crates/gosub_html5/src/tokenizer/replacement_tables.rs similarity index 100% rename from crates/gosub-html5/src/tokenizer/replacement_tables.rs rename to crates/gosub_html5/src/tokenizer/replacement_tables.rs diff --git a/crates/gosub-html5/src/tokenizer/results.md b/crates/gosub_html5/src/tokenizer/results.md similarity index 100% rename from crates/gosub-html5/src/tokenizer/results.md rename to crates/gosub_html5/src/tokenizer/results.md diff --git a/crates/gosub-html5/src/tokenizer/state.rs b/crates/gosub_html5/src/tokenizer/state.rs similarity index 100% rename from crates/gosub-html5/src/tokenizer/state.rs rename to crates/gosub_html5/src/tokenizer/state.rs diff --git a/crates/gosub-html5/src/tokenizer/token.rs b/crates/gosub_html5/src/tokenizer/token.rs similarity index 100% rename from crates/gosub-html5/src/tokenizer/token.rs rename to crates/gosub_html5/src/tokenizer/token.rs diff --git a/crates/gosub-html5/src/util.rs b/crates/gosub_html5/src/util.rs similarity index 100% rename from crates/gosub-html5/src/util.rs rename to crates/gosub_html5/src/util.rs diff --git a/crates/gosub-jsapi/Cargo.toml b/crates/gosub_jsapi/Cargo.toml similarity index 77% rename from crates/gosub-jsapi/Cargo.toml rename to crates/gosub_jsapi/Cargo.toml index 8533ee2e0..ecd31d723 100644 --- a/crates/gosub-jsapi/Cargo.toml +++ b/crates/gosub_jsapi/Cargo.toml @@ -6,6 +6,6 @@ authors = ["Gosub Community "] license = "MIT" [dependencies] -gosub_shared = { path = "../gosub-shared", features = [] } +gosub_shared = { path = "../gosub_shared", features = [] } uuid = { version = "1.7.0", features = ["v4"] } regex = "1" diff --git a/crates/gosub-jsapi/src/console.rs b/crates/gosub_jsapi/src/console.rs similarity index 100% rename from crates/gosub-jsapi/src/console.rs rename to crates/gosub_jsapi/src/console.rs diff --git a/crates/gosub-jsapi/src/console/buffer.rs b/crates/gosub_jsapi/src/console/buffer.rs similarity index 100% rename from crates/gosub-jsapi/src/console/buffer.rs rename to crates/gosub_jsapi/src/console/buffer.rs diff --git a/crates/gosub-jsapi/src/console/formatter.rs b/crates/gosub_jsapi/src/console/formatter.rs similarity index 100% rename from crates/gosub-jsapi/src/console/formatter.rs rename to crates/gosub_jsapi/src/console/formatter.rs diff --git a/crates/gosub-jsapi/src/console/writable_printer.rs b/crates/gosub_jsapi/src/console/writable_printer.rs similarity index 100% rename from crates/gosub-jsapi/src/console/writable_printer.rs rename to crates/gosub_jsapi/src/console/writable_printer.rs diff --git a/crates/gosub-jsapi/src/lib.rs b/crates/gosub_jsapi/src/lib.rs similarity index 100% rename from crates/gosub-jsapi/src/lib.rs rename to crates/gosub_jsapi/src/lib.rs diff --git a/crates/gosub-net/Cargo.toml b/crates/gosub_net/Cargo.toml similarity index 77% rename from crates/gosub-net/Cargo.toml rename to crates/gosub_net/Cargo.toml index 87bb473ae..508d29007 100644 --- a/crates/gosub-net/Cargo.toml +++ b/crates/gosub_net/Cargo.toml @@ -6,8 +6,8 @@ authors = ["Gosub Community "] license = "MIT" [dependencies] -gosub_shared = { path = "../gosub-shared", features = [] } -gosub_config = { path = "../gosub-config", features = [] } +gosub_shared = { path = "../gosub_shared", features = [] } +gosub_config = { path = "../gosub_config", features = [] } derive_more = "0.99" thiserror = "1.0.57" ureq = "2.9.5" diff --git a/crates/gosub-net/src/dns.rs b/crates/gosub_net/src/dns.rs similarity index 100% rename from crates/gosub-net/src/dns.rs rename to crates/gosub_net/src/dns.rs diff --git a/crates/gosub-net/src/dns/cache.rs b/crates/gosub_net/src/dns/cache.rs similarity index 100% rename from crates/gosub-net/src/dns/cache.rs rename to crates/gosub_net/src/dns/cache.rs diff --git a/crates/gosub-net/src/dns/local.rs b/crates/gosub_net/src/dns/local.rs similarity index 100% rename from crates/gosub-net/src/dns/local.rs rename to crates/gosub_net/src/dns/local.rs diff --git a/crates/gosub-net/src/dns/remote.rs b/crates/gosub_net/src/dns/remote.rs similarity index 100% rename from crates/gosub-net/src/dns/remote.rs rename to crates/gosub_net/src/dns/remote.rs diff --git a/crates/gosub-net/src/errors.rs b/crates/gosub_net/src/errors.rs similarity index 100% rename from crates/gosub-net/src/errors.rs rename to crates/gosub_net/src/errors.rs diff --git a/crates/gosub-net/src/http.rs b/crates/gosub_net/src/http.rs similarity index 100% rename from crates/gosub-net/src/http.rs rename to crates/gosub_net/src/http.rs diff --git a/crates/gosub-net/src/http/headers.rs b/crates/gosub_net/src/http/headers.rs similarity index 100% rename from crates/gosub-net/src/http/headers.rs rename to crates/gosub_net/src/http/headers.rs diff --git a/crates/gosub-net/src/http/request.rs b/crates/gosub_net/src/http/request.rs similarity index 100% rename from crates/gosub-net/src/http/request.rs rename to crates/gosub_net/src/http/request.rs diff --git a/crates/gosub-net/src/http/response.rs b/crates/gosub_net/src/http/response.rs similarity index 100% rename from crates/gosub-net/src/http/response.rs rename to crates/gosub_net/src/http/response.rs diff --git a/crates/gosub-net/src/lib.rs b/crates/gosub_net/src/lib.rs similarity index 100% rename from crates/gosub-net/src/lib.rs rename to crates/gosub_net/src/lib.rs diff --git a/crates/gosub-rendering/Cargo.toml b/crates/gosub_rendering/Cargo.toml similarity index 77% rename from crates/gosub-rendering/Cargo.toml rename to crates/gosub_rendering/Cargo.toml index 2ee1214f2..4de50c8e0 100644 --- a/crates/gosub-rendering/Cargo.toml +++ b/crates/gosub_rendering/Cargo.toml @@ -6,4 +6,4 @@ authors = ["Gosub Community "] license = "MIT" [dependencies] -gosub_html5 = { path = "../gosub-html5" } +gosub_html5 = { path = "../gosub_html5" } diff --git a/crates/gosub-rendering/src/lib.rs b/crates/gosub_rendering/src/lib.rs similarity index 100% rename from crates/gosub-rendering/src/lib.rs rename to crates/gosub_rendering/src/lib.rs diff --git a/crates/gosub-rendering/src/render_tree.rs b/crates/gosub_rendering/src/render_tree.rs similarity index 100% rename from crates/gosub-rendering/src/render_tree.rs rename to crates/gosub_rendering/src/render_tree.rs diff --git a/crates/gosub-rendering/src/render_tree/properties.rs b/crates/gosub_rendering/src/render_tree/properties.rs similarity index 100% rename from crates/gosub-rendering/src/render_tree/properties.rs rename to crates/gosub_rendering/src/render_tree/properties.rs diff --git a/crates/gosub-rendering/src/render_tree/text.rs b/crates/gosub_rendering/src/render_tree/text.rs similarity index 100% rename from crates/gosub-rendering/src/render_tree/text.rs rename to crates/gosub_rendering/src/render_tree/text.rs diff --git a/crates/gosub-rendering/src/render_tree/util.rs b/crates/gosub_rendering/src/render_tree/util.rs similarity index 100% rename from crates/gosub-rendering/src/render_tree/util.rs rename to crates/gosub_rendering/src/render_tree/util.rs diff --git a/crates/gosub-shared/Cargo.toml b/crates/gosub_shared/Cargo.toml similarity index 100% rename from crates/gosub-shared/Cargo.toml rename to crates/gosub_shared/Cargo.toml diff --git a/crates/gosub-shared/src/byte_stream.rs b/crates/gosub_shared/src/byte_stream.rs similarity index 100% rename from crates/gosub-shared/src/byte_stream.rs rename to crates/gosub_shared/src/byte_stream.rs diff --git a/crates/gosub-shared/src/bytes.rs b/crates/gosub_shared/src/bytes.rs similarity index 100% rename from crates/gosub-shared/src/bytes.rs rename to crates/gosub_shared/src/bytes.rs diff --git a/crates/gosub-shared/src/lib.rs b/crates/gosub_shared/src/lib.rs similarity index 100% rename from crates/gosub-shared/src/lib.rs rename to crates/gosub_shared/src/lib.rs diff --git a/crates/gosub-shared/src/timing.rs b/crates/gosub_shared/src/timing.rs similarity index 100% rename from crates/gosub-shared/src/timing.rs rename to crates/gosub_shared/src/timing.rs diff --git a/crates/gosub-shared/src/types.rs b/crates/gosub_shared/src/types.rs similarity index 100% rename from crates/gosub-shared/src/types.rs rename to crates/gosub_shared/src/types.rs diff --git a/crates/gosub-testing/Cargo.toml b/crates/gosub_testing/Cargo.toml similarity index 80% rename from crates/gosub-testing/Cargo.toml rename to crates/gosub_testing/Cargo.toml index 0d97483f1..0db2e895c 100644 --- a/crates/gosub-testing/Cargo.toml +++ b/crates/gosub_testing/Cargo.toml @@ -6,8 +6,8 @@ authors = ["Gosub Community "] license = "MIT" [dependencies] -gosub_shared = { path = "../gosub-shared" } -gosub_html5 = { path = "../gosub-html5" } +gosub_shared = { path = "../gosub_shared" } +gosub_html5 = { path = "../gosub_html5" } serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["preserve_order"] } serde_derive = "1.0" diff --git a/crates/gosub-testing/src/lib.rs b/crates/gosub_testing/src/lib.rs similarity index 100% rename from crates/gosub-testing/src/lib.rs rename to crates/gosub_testing/src/lib.rs diff --git a/crates/gosub-testing/src/testing.rs b/crates/gosub_testing/src/testing.rs similarity index 100% rename from crates/gosub-testing/src/testing.rs rename to crates/gosub_testing/src/testing.rs diff --git a/crates/gosub-testing/src/testing/tokenizer.rs b/crates/gosub_testing/src/testing/tokenizer.rs similarity index 100% rename from crates/gosub-testing/src/testing/tokenizer.rs rename to crates/gosub_testing/src/testing/tokenizer.rs diff --git a/crates/gosub-testing/src/testing/tree_construction.rs b/crates/gosub_testing/src/testing/tree_construction.rs similarity index 100% rename from crates/gosub-testing/src/testing/tree_construction.rs rename to crates/gosub_testing/src/testing/tree_construction.rs diff --git a/crates/gosub-testing/src/testing/tree_construction/fixture.rs b/crates/gosub_testing/src/testing/tree_construction/fixture.rs similarity index 100% rename from crates/gosub-testing/src/testing/tree_construction/fixture.rs rename to crates/gosub_testing/src/testing/tree_construction/fixture.rs diff --git a/crates/gosub-testing/src/testing/tree_construction/generator.rs b/crates/gosub_testing/src/testing/tree_construction/generator.rs similarity index 100% rename from crates/gosub-testing/src/testing/tree_construction/generator.rs rename to crates/gosub_testing/src/testing/tree_construction/generator.rs diff --git a/crates/gosub-testing/src/testing/tree_construction/parser.rs b/crates/gosub_testing/src/testing/tree_construction/parser.rs similarity index 100% rename from crates/gosub-testing/src/testing/tree_construction/parser.rs rename to crates/gosub_testing/src/testing/tree_construction/parser.rs diff --git a/crates/gosub-testing/src/testing/tree_construction/result.rs b/crates/gosub_testing/src/testing/tree_construction/result.rs similarity index 100% rename from crates/gosub-testing/src/testing/tree_construction/result.rs rename to crates/gosub_testing/src/testing/tree_construction/result.rs diff --git a/crates/gosub-webexecutor/Cargo.toml b/crates/gosub_webexecutor/Cargo.toml similarity index 85% rename from crates/gosub-webexecutor/Cargo.toml rename to crates/gosub_webexecutor/Cargo.toml index 4f5460bfb..f27e4b487 100644 --- a/crates/gosub-webexecutor/Cargo.toml +++ b/crates/gosub_webexecutor/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Gosub Community "] license = "MIT" [dependencies] -gosub_shared = { path = "../gosub-shared" } +gosub_shared = { path = "../gosub_shared" } colored = "2.1.0" derive_more = "0.99" lazy_static = "1.4" diff --git a/crates/gosub-webexecutor/src/js.rs b/crates/gosub_webexecutor/src/js.rs similarity index 100% rename from crates/gosub-webexecutor/src/js.rs rename to crates/gosub_webexecutor/src/js.rs diff --git a/crates/gosub-webexecutor/src/js/compile.rs b/crates/gosub_webexecutor/src/js/compile.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/compile.rs rename to crates/gosub_webexecutor/src/js/compile.rs diff --git a/crates/gosub-webexecutor/src/js/context.rs b/crates/gosub_webexecutor/src/js/context.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/context.rs rename to crates/gosub_webexecutor/src/js/context.rs diff --git a/crates/gosub-webexecutor/src/js/function.rs b/crates/gosub_webexecutor/src/js/function.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/function.rs rename to crates/gosub_webexecutor/src/js/function.rs diff --git a/crates/gosub-webexecutor/src/js/interop.rs b/crates/gosub_webexecutor/src/js/interop.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/interop.rs rename to crates/gosub_webexecutor/src/js/interop.rs diff --git a/crates/gosub-webexecutor/src/js/object.rs b/crates/gosub_webexecutor/src/js/object.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/object.rs rename to crates/gosub_webexecutor/src/js/object.rs diff --git a/crates/gosub-webexecutor/src/js/runtime.rs b/crates/gosub_webexecutor/src/js/runtime.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/runtime.rs rename to crates/gosub_webexecutor/src/js/runtime.rs diff --git a/crates/gosub-webexecutor/src/js/v8.rs b/crates/gosub_webexecutor/src/js/v8.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/v8.rs rename to crates/gosub_webexecutor/src/js/v8.rs diff --git a/crates/gosub-webexecutor/src/js/v8/array.rs b/crates/gosub_webexecutor/src/js/v8/array.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/v8/array.rs rename to crates/gosub_webexecutor/src/js/v8/array.rs diff --git a/crates/gosub-webexecutor/src/js/v8/compile.rs b/crates/gosub_webexecutor/src/js/v8/compile.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/v8/compile.rs rename to crates/gosub_webexecutor/src/js/v8/compile.rs diff --git a/crates/gosub-webexecutor/src/js/v8/context.rs b/crates/gosub_webexecutor/src/js/v8/context.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/v8/context.rs rename to crates/gosub_webexecutor/src/js/v8/context.rs diff --git a/crates/gosub-webexecutor/src/js/v8/function.rs b/crates/gosub_webexecutor/src/js/v8/function.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/v8/function.rs rename to crates/gosub_webexecutor/src/js/v8/function.rs diff --git a/crates/gosub-webexecutor/src/js/v8/object.rs b/crates/gosub_webexecutor/src/js/v8/object.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/v8/object.rs rename to crates/gosub_webexecutor/src/js/v8/object.rs diff --git a/crates/gosub-webexecutor/src/js/v8/value.rs b/crates/gosub_webexecutor/src/js/v8/value.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/v8/value.rs rename to crates/gosub_webexecutor/src/js/v8/value.rs diff --git a/crates/gosub-webexecutor/src/js/value.rs b/crates/gosub_webexecutor/src/js/value.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/value.rs rename to crates/gosub_webexecutor/src/js/value.rs diff --git a/crates/gosub-webexecutor/src/js/value_conversion.rs b/crates/gosub_webexecutor/src/js/value_conversion.rs similarity index 100% rename from crates/gosub-webexecutor/src/js/value_conversion.rs rename to crates/gosub_webexecutor/src/js/value_conversion.rs diff --git a/crates/gosub-webexecutor/src/lib.rs b/crates/gosub_webexecutor/src/lib.rs similarity index 100% rename from crates/gosub-webexecutor/src/lib.rs rename to crates/gosub_webexecutor/src/lib.rs diff --git a/crates/gosub-webexecutor/src/test.rs b/crates/gosub_webexecutor/src/test.rs similarity index 100% rename from crates/gosub-webexecutor/src/test.rs rename to crates/gosub_webexecutor/src/test.rs