From f171dc9d095b9b1f63ba5bb69fbbbdf4aef7ccf2 Mon Sep 17 00:00:00 2001 From: Sergio Benitez Date: Sun, 3 Jun 2018 18:44:38 +0200 Subject: [PATCH] Reorganize repository. The directory structure has changed to better isolate crates serving core and contrib. The new directory structure is: contrib/ lib/ - the contrib library core/ lib/ - the core Rocket library codegen/ - the "compile extension" codegen library codegen_next/ - the new proc-macro library examples/ - unchanged scripts/ - unchanged site/ - unchanged This commit also removes the following files: appveyor.yml - AppVeyor (Rust on Windows) is far too spotty for use rustfmt.toml - rustfmt is, unfortunately, not mature enough for use Finally, all example Cargo crates were marked with 'publish = false'. --- Cargo.toml | 8 ++--- appveyor.yml | 34 ------------------- contrib/{ => lib}/Cargo.toml | 2 +- contrib/{ => lib}/src/json.rs | 0 contrib/{ => lib}/src/lib.rs | 0 contrib/{ => lib}/src/msgpack.rs | 0 contrib/{ => lib}/src/templates/context.rs | 0 contrib/{ => lib}/src/templates/engine.rs | 0 .../src/templates/handlebars_templates.rs | 0 contrib/{ => lib}/src/templates/mod.rs | 0 .../{ => lib}/src/templates/tera_templates.rs | 0 contrib/{ => lib}/src/uuid.rs | 0 contrib/{ => lib}/tests/templates.rs | 0 .../templates/hbs/common/footer.html.hbs | 0 .../templates/hbs/common/header.html.hbs | 0 .../tests/templates/hbs/test.html.hbs | 0 .../tests/templates/tera/base.txt.tera | 0 .../tests/templates/tera/html_test.html.tera | 0 .../tests/templates/tera/txt_test.txt.tera | 0 {codegen => core/codegen}/Cargo.toml | 0 {codegen => core/codegen}/build.rs | 0 .../codegen}/src/decorators/catch.rs | 0 .../codegen}/src/decorators/derive_form.rs | 0 .../codegen}/src/decorators/mod.rs | 0 .../codegen}/src/decorators/route.rs | 0 {codegen => core/codegen}/src/lib.rs | 0 {codegen => core/codegen}/src/macros/mod.rs | 0 {codegen => core/codegen}/src/macros/uri.rs | 0 {codegen => core/codegen}/src/parser/catch.rs | 0 .../codegen}/src/parser/function.rs | 0 .../codegen}/src/parser/keyvalue.rs | 0 {codegen => core/codegen}/src/parser/mod.rs | 0 {codegen => core/codegen}/src/parser/param.rs | 0 {codegen => core/codegen}/src/parser/route.rs | 0 {codegen => core/codegen}/src/parser/uri.rs | 0 .../codegen}/src/parser/uri_macro.rs | 0 .../codegen}/src/utils/arg_ext.rs | 0 .../codegen}/src/utils/expr_ext.rs | 0 .../codegen}/src/utils/ident_ext.rs | 0 .../codegen}/src/utils/meta_item_ext.rs | 0 {codegen => core/codegen}/src/utils/mod.rs | 0 .../codegen}/src/utils/parser_ext.rs | 0 .../codegen}/src/utils/span_ext.rs | 0 .../compile-fail/absolute-mount-paths.rs | 0 .../tests/compile-fail/bad-attribute-form.rs | 0 .../tests/compile-fail/bad-attribute-param.rs | 0 .../tests/compile-fail/bad-ident-argument.rs | 0 .../bad-value-types-in-attribute.rs | 0 .../tests/compile-fail/decorate-enum.rs | 0 .../tests/compile-fail/decorate-impl.rs | 0 .../tests/compile-fail/decorate-struct.rs | 0 .../tests/compile-fail/decorate-trait.rs | 0 .../tests/compile-fail/empty-segments.rs | 0 .../tests/compile-fail/form-field-attr.rs | 0 .../tests/compile-fail/ignored_params.rs | 0 .../compile-fail/malformed-media-type.rs | 0 .../compile-fail/phantom-declared-param.rs | 0 .../compile-fail/unknown-attribute-param.rs | 0 .../tests/compile-fail/unknown-media-type.rs | 0 .../codegen}/tests/compiletest.rs | 2 +- .../codegen}/tests/complete-decorator.rs | 0 .../codegen}/tests/custom-content-type.rs | 0 .../codegen}/tests/derive_form.rs | 0 .../codegen}/tests/dynamic-paths.rs | 0 {codegen => core/codegen}/tests/empty-fn.rs | 0 {codegen => core/codegen}/tests/empty_form.rs | 0 .../codegen}/tests/error-handler.rs | 0 .../codegen}/tests/form-field-rename.rs | 0 .../codegen}/tests/instanced-mounting.rs | 0 .../codegen}/tests/issue-1-colliding-names.rs | 0 {codegen => core/codegen}/tests/methods.rs | 0 .../codegen}/tests/rank_decorator.rs | 0 .../tests/refactored_rocket_no_lint_errors.rs | 0 {codegen => core/codegen}/tests/segments.rs | 0 .../codegen}/tests/type-alias-lints.rs | 0 {codegen => core/codegen}/tests/typed-uris.rs | 0 .../codegen}/tests/ui/bad-error-fn.rs | 0 .../codegen}/tests/ui/bad-error-fn.stderr | 0 .../codegen}/tests/ui/data-without-post.rs | 0 .../tests/ui/data-without-post.stderr | 0 .../codegen}/tests/ui/malformed-param-list.rs | 0 .../tests/ui/malformed-param-list.stderr | 0 .../codegen}/tests/ui/route-bad-method.rs | 0 .../codegen}/tests/ui/route-bad-method.stderr | 0 .../codegen}/tests/ui/typed-uri-bad-type.rs | 0 .../tests/ui/typed-uri-bad-type.stderr | 0 .../tests/ui/typed-uris-bad-params.rs | 0 .../tests/ui/typed-uris-bad-params.stderr | 0 .../tests/ui/typed-uris-invalid-syntax.rs | 0 .../tests/ui/typed-uris-invalid-syntax.stderr | 0 .../codegen_next}/Cargo.toml | 3 ++ .../codegen_next}/src/codegen_ext.rs | 0 .../codegen_next}/src/ext.rs | 0 .../codegen_next}/src/lib.rs | 0 .../codegen_next}/src/parser.rs | 0 .../codegen_next}/src/spanned.rs | 0 {lib => core/lib}/Cargo.toml | 0 {lib => core/lib}/benches/format-routing.rs | 0 {lib => core/lib}/benches/ranked-routing.rs | 0 {lib => core/lib}/benches/simple-routing.rs | 0 {lib => core/lib}/build.rs | 0 {lib => core/lib}/src/catcher.rs | 0 {lib => core/lib}/src/codegen.rs | 0 {lib => core/lib}/src/config/builder.rs | 0 {lib => core/lib}/src/config/config.rs | 0 {lib => core/lib}/src/config/custom_values.rs | 0 {lib => core/lib}/src/config/environment.rs | 0 {lib => core/lib}/src/config/error.rs | 0 {lib => core/lib}/src/config/mod.rs | 0 {lib => core/lib}/src/config/toml_ext.rs | 0 {lib => core/lib}/src/data/data.rs | 0 {lib => core/lib}/src/data/data_stream.rs | 0 {lib => core/lib}/src/data/from_data.rs | 0 {lib => core/lib}/src/data/mod.rs | 0 {lib => core/lib}/src/data/net_stream.rs | 0 {lib => core/lib}/src/docify.rs | 0 {lib => core/lib}/src/error.rs | 0 {lib => core/lib}/src/ext.rs | 0 {lib => core/lib}/src/fairing/ad_hoc.rs | 0 {lib => core/lib}/src/fairing/fairings.rs | 0 {lib => core/lib}/src/fairing/info_kind.rs | 0 {lib => core/lib}/src/fairing/mod.rs | 0 {lib => core/lib}/src/handler.rs | 0 {lib => core/lib}/src/http/accept.rs | 0 {lib => core/lib}/src/http/content_type.rs | 0 {lib => core/lib}/src/http/cookies.rs | 0 {lib => core/lib}/src/http/header.rs | 0 {lib => core/lib}/src/http/hyper.rs | 0 .../lib}/src/http/known_media_types.rs | 0 {lib => core/lib}/src/http/media_type.rs | 0 {lib => core/lib}/src/http/method.rs | 0 {lib => core/lib}/src/http/mod.rs | 0 {lib => core/lib}/src/http/parse/accept.rs | 0 {lib => core/lib}/src/http/parse/checkers.rs | 0 .../lib}/src/http/parse/indexed_str.rs | 0 .../lib}/src/http/parse/media_type.rs | 0 {lib => core/lib}/src/http/parse/mod.rs | 0 {lib => core/lib}/src/http/raw_str.rs | 0 {lib => core/lib}/src/http/status.rs | 0 {lib => core/lib}/src/http/uncased.rs | 0 .../lib}/src/http/uri/from_uri_param.rs | 0 {lib => core/lib}/src/http/uri/mod.rs | 0 {lib => core/lib}/src/http/uri/uri.rs | 0 {lib => core/lib}/src/http/uri/uri_display.rs | 0 {lib => core/lib}/src/lib.rs | 0 {lib => core/lib}/src/local/client.rs | 0 {lib => core/lib}/src/local/mod.rs | 0 {lib => core/lib}/src/local/request.rs | 0 {lib => core/lib}/src/logger.rs | 0 {lib => core/lib}/src/outcome.rs | 0 {lib => core/lib}/src/request/form/form.rs | 0 .../lib}/src/request/form/form_items.rs | 0 .../lib}/src/request/form/from_form.rs | 0 .../lib}/src/request/form/from_form_value.rs | 0 {lib => core/lib}/src/request/form/lenient.rs | 0 {lib => core/lib}/src/request/form/mod.rs | 0 {lib => core/lib}/src/request/from_request.rs | 0 {lib => core/lib}/src/request/mod.rs | 0 {lib => core/lib}/src/request/param.rs | 0 {lib => core/lib}/src/request/request.rs | 0 {lib => core/lib}/src/request/state.rs | 0 {lib => core/lib}/src/request/tests.rs | 0 {lib => core/lib}/src/response/content.rs | 0 {lib => core/lib}/src/response/failure.rs | 0 {lib => core/lib}/src/response/flash.rs | 0 {lib => core/lib}/src/response/mod.rs | 0 {lib => core/lib}/src/response/named_file.rs | 0 {lib => core/lib}/src/response/redirect.rs | 0 {lib => core/lib}/src/response/responder.rs | 0 {lib => core/lib}/src/response/response.rs | 0 {lib => core/lib}/src/response/status.rs | 0 {lib => core/lib}/src/response/stream.rs | 0 {lib => core/lib}/src/rocket.rs | 0 {lib => core/lib}/src/router/collider.rs | 0 {lib => core/lib}/src/router/mod.rs | 0 {lib => core/lib}/src/router/route.rs | 0 .../fairing_before_head_strip-issue-546.rs | 0 .../tests/flash-lazy-removes-issue-466.rs | 0 .../lib}/tests/form_method-issue-45.rs | 0 .../tests/form_value_decoding-issue-82.rs | 0 {lib => core/lib}/tests/head_handling.rs | 0 {lib => core/lib}/tests/limits.rs | 0 .../local-request-content-type-issue-505.rs | 0 .../local_request_private_cookie-issue-368.rs | 0 {lib => core/lib}/tests/mount_point.rs | 0 .../lib}/tests/nested-fairing-attaches.rs | 0 .../tests/precise-content-type-matching.rs | 0 .../tests/query-and-non-query-dont-collide.rs | 0 .../tests/redirect_from_catcher-issue-113.rs | 0 .../tests/responder_lifetime-issue-345.rs | 0 {lib => core/lib}/tests/route_guard.rs | 0 .../lib}/tests/segments-issues-41-86.rs | 0 .../lib}/tests/strict_and_lenient_forms.rs | 0 examples/config/Cargo.toml | 5 +-- examples/content_types/Cargo.toml | 5 +-- examples/cookies/Cargo.toml | 7 ++-- examples/errors/Cargo.toml | 5 +-- examples/fairings/Cargo.toml | 5 +-- examples/form_kitchen_sink/Cargo.toml | 5 +-- examples/form_validation/Cargo.toml | 5 +-- examples/handlebars_templates/Cargo.toml | 7 ++-- examples/hello_person/Cargo.toml | 5 +-- examples/hello_world/Cargo.toml | 5 +-- examples/json/Cargo.toml | 7 ++-- examples/managed_queue/Cargo.toml | 5 +-- examples/manual_routes/Cargo.toml | 3 +- examples/msgpack/Cargo.toml | 7 ++-- examples/optional_redirect/Cargo.toml | 5 +-- examples/pastebin/Cargo.toml | 5 +-- examples/query_params/Cargo.toml | 5 +-- examples/ranking/Cargo.toml | 5 +-- examples/raw_sqlite/Cargo.toml | 5 +-- examples/raw_upload/Cargo.toml | 5 +-- examples/redirect/Cargo.toml | 5 +-- examples/request_guard/Cargo.toml | 5 +-- examples/session/Cargo.toml | 7 ++-- examples/state/Cargo.toml | 5 +-- examples/static_files/Cargo.toml | 5 +-- examples/stream/Cargo.toml | 5 +-- examples/tera_templates/Cargo.toml | 7 ++-- examples/testing/Cargo.toml | 5 +-- examples/tls/Cargo.toml | 5 +-- examples/todo/Cargo.toml | 7 ++-- examples/uuid/Cargo.toml | 7 ++-- rustfmt.toml | 14 -------- scripts/config.sh | 6 ++-- 226 files changed, 112 insertions(+), 126 deletions(-) delete mode 100644 appveyor.yml rename contrib/{ => lib}/Cargo.toml (95%) rename contrib/{ => lib}/src/json.rs (100%) rename contrib/{ => lib}/src/lib.rs (100%) rename contrib/{ => lib}/src/msgpack.rs (100%) rename contrib/{ => lib}/src/templates/context.rs (100%) rename contrib/{ => lib}/src/templates/engine.rs (100%) rename contrib/{ => lib}/src/templates/handlebars_templates.rs (100%) rename contrib/{ => lib}/src/templates/mod.rs (100%) rename contrib/{ => lib}/src/templates/tera_templates.rs (100%) rename contrib/{ => lib}/src/uuid.rs (100%) rename contrib/{ => lib}/tests/templates.rs (100%) rename contrib/{ => lib}/tests/templates/hbs/common/footer.html.hbs (100%) rename contrib/{ => lib}/tests/templates/hbs/common/header.html.hbs (100%) rename contrib/{ => lib}/tests/templates/hbs/test.html.hbs (100%) rename contrib/{ => lib}/tests/templates/tera/base.txt.tera (100%) rename contrib/{ => lib}/tests/templates/tera/html_test.html.tera (100%) rename contrib/{ => lib}/tests/templates/tera/txt_test.txt.tera (100%) rename {codegen => core/codegen}/Cargo.toml (100%) rename {codegen => core/codegen}/build.rs (100%) rename {codegen => core/codegen}/src/decorators/catch.rs (100%) rename {codegen => core/codegen}/src/decorators/derive_form.rs (100%) rename {codegen => core/codegen}/src/decorators/mod.rs (100%) rename {codegen => core/codegen}/src/decorators/route.rs (100%) rename {codegen => core/codegen}/src/lib.rs (100%) rename {codegen => core/codegen}/src/macros/mod.rs (100%) rename {codegen => core/codegen}/src/macros/uri.rs (100%) rename {codegen => core/codegen}/src/parser/catch.rs (100%) rename {codegen => core/codegen}/src/parser/function.rs (100%) rename {codegen => core/codegen}/src/parser/keyvalue.rs (100%) rename {codegen => core/codegen}/src/parser/mod.rs (100%) rename {codegen => core/codegen}/src/parser/param.rs (100%) rename {codegen => core/codegen}/src/parser/route.rs (100%) rename {codegen => core/codegen}/src/parser/uri.rs (100%) rename {codegen => core/codegen}/src/parser/uri_macro.rs (100%) rename {codegen => core/codegen}/src/utils/arg_ext.rs (100%) rename {codegen => core/codegen}/src/utils/expr_ext.rs (100%) rename {codegen => core/codegen}/src/utils/ident_ext.rs (100%) rename {codegen => core/codegen}/src/utils/meta_item_ext.rs (100%) rename {codegen => core/codegen}/src/utils/mod.rs (100%) rename {codegen => core/codegen}/src/utils/parser_ext.rs (100%) rename {codegen => core/codegen}/src/utils/span_ext.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/absolute-mount-paths.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/bad-attribute-form.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/bad-attribute-param.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/bad-ident-argument.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/bad-value-types-in-attribute.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/decorate-enum.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/decorate-impl.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/decorate-struct.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/decorate-trait.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/empty-segments.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/form-field-attr.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/ignored_params.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/malformed-media-type.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/phantom-declared-param.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/unknown-attribute-param.rs (100%) rename {codegen => core/codegen}/tests/compile-fail/unknown-media-type.rs (100%) rename {codegen => core/codegen}/tests/compiletest.rs (98%) rename {codegen => core/codegen}/tests/complete-decorator.rs (100%) rename {codegen => core/codegen}/tests/custom-content-type.rs (100%) rename {codegen => core/codegen}/tests/derive_form.rs (100%) rename {codegen => core/codegen}/tests/dynamic-paths.rs (100%) rename {codegen => core/codegen}/tests/empty-fn.rs (100%) rename {codegen => core/codegen}/tests/empty_form.rs (100%) rename {codegen => core/codegen}/tests/error-handler.rs (100%) rename {codegen => core/codegen}/tests/form-field-rename.rs (100%) rename {codegen => core/codegen}/tests/instanced-mounting.rs (100%) rename {codegen => core/codegen}/tests/issue-1-colliding-names.rs (100%) rename {codegen => core/codegen}/tests/methods.rs (100%) rename {codegen => core/codegen}/tests/rank_decorator.rs (100%) rename {codegen => core/codegen}/tests/refactored_rocket_no_lint_errors.rs (100%) rename {codegen => core/codegen}/tests/segments.rs (100%) rename {codegen => core/codegen}/tests/type-alias-lints.rs (100%) rename {codegen => core/codegen}/tests/typed-uris.rs (100%) rename {codegen => core/codegen}/tests/ui/bad-error-fn.rs (100%) rename {codegen => core/codegen}/tests/ui/bad-error-fn.stderr (100%) rename {codegen => core/codegen}/tests/ui/data-without-post.rs (100%) rename {codegen => core/codegen}/tests/ui/data-without-post.stderr (100%) rename {codegen => core/codegen}/tests/ui/malformed-param-list.rs (100%) rename {codegen => core/codegen}/tests/ui/malformed-param-list.stderr (100%) rename {codegen => core/codegen}/tests/ui/route-bad-method.rs (100%) rename {codegen => core/codegen}/tests/ui/route-bad-method.stderr (100%) rename {codegen => core/codegen}/tests/ui/typed-uri-bad-type.rs (100%) rename {codegen => core/codegen}/tests/ui/typed-uri-bad-type.stderr (100%) rename {codegen => core/codegen}/tests/ui/typed-uris-bad-params.rs (100%) rename {codegen => core/codegen}/tests/ui/typed-uris-bad-params.stderr (100%) rename {codegen => core/codegen}/tests/ui/typed-uris-invalid-syntax.rs (100%) rename {codegen => core/codegen}/tests/ui/typed-uris-invalid-syntax.stderr (100%) rename {codegen_next => core/codegen_next}/Cargo.toml (91%) rename {codegen_next => core/codegen_next}/src/codegen_ext.rs (100%) rename {codegen_next => core/codegen_next}/src/ext.rs (100%) rename {codegen_next => core/codegen_next}/src/lib.rs (100%) rename {codegen_next => core/codegen_next}/src/parser.rs (100%) rename {codegen_next => core/codegen_next}/src/spanned.rs (100%) rename {lib => core/lib}/Cargo.toml (100%) rename {lib => core/lib}/benches/format-routing.rs (100%) rename {lib => core/lib}/benches/ranked-routing.rs (100%) rename {lib => core/lib}/benches/simple-routing.rs (100%) rename {lib => core/lib}/build.rs (100%) rename {lib => core/lib}/src/catcher.rs (100%) rename {lib => core/lib}/src/codegen.rs (100%) rename {lib => core/lib}/src/config/builder.rs (100%) rename {lib => core/lib}/src/config/config.rs (100%) rename {lib => core/lib}/src/config/custom_values.rs (100%) rename {lib => core/lib}/src/config/environment.rs (100%) rename {lib => core/lib}/src/config/error.rs (100%) rename {lib => core/lib}/src/config/mod.rs (100%) rename {lib => core/lib}/src/config/toml_ext.rs (100%) rename {lib => core/lib}/src/data/data.rs (100%) rename {lib => core/lib}/src/data/data_stream.rs (100%) rename {lib => core/lib}/src/data/from_data.rs (100%) rename {lib => core/lib}/src/data/mod.rs (100%) rename {lib => core/lib}/src/data/net_stream.rs (100%) rename {lib => core/lib}/src/docify.rs (100%) rename {lib => core/lib}/src/error.rs (100%) rename {lib => core/lib}/src/ext.rs (100%) rename {lib => core/lib}/src/fairing/ad_hoc.rs (100%) rename {lib => core/lib}/src/fairing/fairings.rs (100%) rename {lib => core/lib}/src/fairing/info_kind.rs (100%) rename {lib => core/lib}/src/fairing/mod.rs (100%) rename {lib => core/lib}/src/handler.rs (100%) rename {lib => core/lib}/src/http/accept.rs (100%) rename {lib => core/lib}/src/http/content_type.rs (100%) rename {lib => core/lib}/src/http/cookies.rs (100%) rename {lib => core/lib}/src/http/header.rs (100%) rename {lib => core/lib}/src/http/hyper.rs (100%) rename {lib => core/lib}/src/http/known_media_types.rs (100%) rename {lib => core/lib}/src/http/media_type.rs (100%) rename {lib => core/lib}/src/http/method.rs (100%) rename {lib => core/lib}/src/http/mod.rs (100%) rename {lib => core/lib}/src/http/parse/accept.rs (100%) rename {lib => core/lib}/src/http/parse/checkers.rs (100%) rename {lib => core/lib}/src/http/parse/indexed_str.rs (100%) rename {lib => core/lib}/src/http/parse/media_type.rs (100%) rename {lib => core/lib}/src/http/parse/mod.rs (100%) rename {lib => core/lib}/src/http/raw_str.rs (100%) rename {lib => core/lib}/src/http/status.rs (100%) rename {lib => core/lib}/src/http/uncased.rs (100%) rename {lib => core/lib}/src/http/uri/from_uri_param.rs (100%) rename {lib => core/lib}/src/http/uri/mod.rs (100%) rename {lib => core/lib}/src/http/uri/uri.rs (100%) rename {lib => core/lib}/src/http/uri/uri_display.rs (100%) rename {lib => core/lib}/src/lib.rs (100%) rename {lib => core/lib}/src/local/client.rs (100%) rename {lib => core/lib}/src/local/mod.rs (100%) rename {lib => core/lib}/src/local/request.rs (100%) rename {lib => core/lib}/src/logger.rs (100%) rename {lib => core/lib}/src/outcome.rs (100%) rename {lib => core/lib}/src/request/form/form.rs (100%) rename {lib => core/lib}/src/request/form/form_items.rs (100%) rename {lib => core/lib}/src/request/form/from_form.rs (100%) rename {lib => core/lib}/src/request/form/from_form_value.rs (100%) rename {lib => core/lib}/src/request/form/lenient.rs (100%) rename {lib => core/lib}/src/request/form/mod.rs (100%) rename {lib => core/lib}/src/request/from_request.rs (100%) rename {lib => core/lib}/src/request/mod.rs (100%) rename {lib => core/lib}/src/request/param.rs (100%) rename {lib => core/lib}/src/request/request.rs (100%) rename {lib => core/lib}/src/request/state.rs (100%) rename {lib => core/lib}/src/request/tests.rs (100%) rename {lib => core/lib}/src/response/content.rs (100%) rename {lib => core/lib}/src/response/failure.rs (100%) rename {lib => core/lib}/src/response/flash.rs (100%) rename {lib => core/lib}/src/response/mod.rs (100%) rename {lib => core/lib}/src/response/named_file.rs (100%) rename {lib => core/lib}/src/response/redirect.rs (100%) rename {lib => core/lib}/src/response/responder.rs (100%) rename {lib => core/lib}/src/response/response.rs (100%) rename {lib => core/lib}/src/response/status.rs (100%) rename {lib => core/lib}/src/response/stream.rs (100%) rename {lib => core/lib}/src/rocket.rs (100%) rename {lib => core/lib}/src/router/collider.rs (100%) rename {lib => core/lib}/src/router/mod.rs (100%) rename {lib => core/lib}/src/router/route.rs (100%) rename {lib => core/lib}/tests/fairing_before_head_strip-issue-546.rs (100%) rename {lib => core/lib}/tests/flash-lazy-removes-issue-466.rs (100%) rename {lib => core/lib}/tests/form_method-issue-45.rs (100%) rename {lib => core/lib}/tests/form_value_decoding-issue-82.rs (100%) rename {lib => core/lib}/tests/head_handling.rs (100%) rename {lib => core/lib}/tests/limits.rs (100%) rename {lib => core/lib}/tests/local-request-content-type-issue-505.rs (100%) rename {lib => core/lib}/tests/local_request_private_cookie-issue-368.rs (100%) rename {lib => core/lib}/tests/mount_point.rs (100%) rename {lib => core/lib}/tests/nested-fairing-attaches.rs (100%) rename {lib => core/lib}/tests/precise-content-type-matching.rs (100%) rename {lib => core/lib}/tests/query-and-non-query-dont-collide.rs (100%) rename {lib => core/lib}/tests/redirect_from_catcher-issue-113.rs (100%) rename {lib => core/lib}/tests/responder_lifetime-issue-345.rs (100%) rename {lib => core/lib}/tests/route_guard.rs (100%) rename {lib => core/lib}/tests/segments-issues-41-86.rs (100%) rename {lib => core/lib}/tests/strict_and_lenient_forms.rs (100%) delete mode 100644 rustfmt.toml diff --git a/Cargo.toml b/Cargo.toml index 78be987e..4341d559 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,10 +3,10 @@ codegen-units = 4 [workspace] members = [ - "lib/", - "codegen/", - "codegen_next/", - "contrib/", + "core/lib/", + "core/codegen/", + "core/codegen_next/", + "contrib/lib", "examples/cookies", "examples/errors", "examples/form_validation", diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 76552a58..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,34 +0,0 @@ -environment: - matrix: - - TARGET: i686-pc-windows-gnu - CHANNEL: nightly - - TARGET: i686-pc-windows-msvc - CHANNEL: nightly - - TARGET: x86_64-pc-windows-gnu - CHANNEL: nightly - - TARGET: x86_64-pc-windows-msvc - CHANNEL: nightly - -# Install Rust and Cargo -install: - - curl -sSf -o rustup-init.exe https://win.rustup.rs - - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y - - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - - rustc -Vv - - cargo -V - -# Disable Appveyor's build stage. This prevents the "directory does not contain -# a project or solution file" error -build: false - -# Equivalent to Travis' `script` phase -test_script: - - sh "./scripts/test.sh" - -branches: - only: - - master - # IMPORTANT Regex to match tags. Required, or appveyor may not trigger - # deploys when a new tag is pushed. This regex matches semantic versions - # like v1.2.3-rc4+2016.02.22 - - /^v\d+\.\d+\.\d+.*$/ diff --git a/contrib/Cargo.toml b/contrib/lib/Cargo.toml similarity index 95% rename from contrib/Cargo.toml rename to contrib/lib/Cargo.toml index f9965afe..8cd7a038 100644 --- a/contrib/Cargo.toml +++ b/contrib/lib/Cargo.toml @@ -21,7 +21,7 @@ handlebars_templates = ["handlebars", "templates"] templates = ["serde", "serde_json", "glob"] [dependencies] -rocket = { version = "0.4.0-dev", path = "../lib/" } +rocket = { version = "0.4.0-dev", path = "../../core/lib/" } log = "0.4" # UUID dependencies. diff --git a/contrib/src/json.rs b/contrib/lib/src/json.rs similarity index 100% rename from contrib/src/json.rs rename to contrib/lib/src/json.rs diff --git a/contrib/src/lib.rs b/contrib/lib/src/lib.rs similarity index 100% rename from contrib/src/lib.rs rename to contrib/lib/src/lib.rs diff --git a/contrib/src/msgpack.rs b/contrib/lib/src/msgpack.rs similarity index 100% rename from contrib/src/msgpack.rs rename to contrib/lib/src/msgpack.rs diff --git a/contrib/src/templates/context.rs b/contrib/lib/src/templates/context.rs similarity index 100% rename from contrib/src/templates/context.rs rename to contrib/lib/src/templates/context.rs diff --git a/contrib/src/templates/engine.rs b/contrib/lib/src/templates/engine.rs similarity index 100% rename from contrib/src/templates/engine.rs rename to contrib/lib/src/templates/engine.rs diff --git a/contrib/src/templates/handlebars_templates.rs b/contrib/lib/src/templates/handlebars_templates.rs similarity index 100% rename from contrib/src/templates/handlebars_templates.rs rename to contrib/lib/src/templates/handlebars_templates.rs diff --git a/contrib/src/templates/mod.rs b/contrib/lib/src/templates/mod.rs similarity index 100% rename from contrib/src/templates/mod.rs rename to contrib/lib/src/templates/mod.rs diff --git a/contrib/src/templates/tera_templates.rs b/contrib/lib/src/templates/tera_templates.rs similarity index 100% rename from contrib/src/templates/tera_templates.rs rename to contrib/lib/src/templates/tera_templates.rs diff --git a/contrib/src/uuid.rs b/contrib/lib/src/uuid.rs similarity index 100% rename from contrib/src/uuid.rs rename to contrib/lib/src/uuid.rs diff --git a/contrib/tests/templates.rs b/contrib/lib/tests/templates.rs similarity index 100% rename from contrib/tests/templates.rs rename to contrib/lib/tests/templates.rs diff --git a/contrib/tests/templates/hbs/common/footer.html.hbs b/contrib/lib/tests/templates/hbs/common/footer.html.hbs similarity index 100% rename from contrib/tests/templates/hbs/common/footer.html.hbs rename to contrib/lib/tests/templates/hbs/common/footer.html.hbs diff --git a/contrib/tests/templates/hbs/common/header.html.hbs b/contrib/lib/tests/templates/hbs/common/header.html.hbs similarity index 100% rename from contrib/tests/templates/hbs/common/header.html.hbs rename to contrib/lib/tests/templates/hbs/common/header.html.hbs diff --git a/contrib/tests/templates/hbs/test.html.hbs b/contrib/lib/tests/templates/hbs/test.html.hbs similarity index 100% rename from contrib/tests/templates/hbs/test.html.hbs rename to contrib/lib/tests/templates/hbs/test.html.hbs diff --git a/contrib/tests/templates/tera/base.txt.tera b/contrib/lib/tests/templates/tera/base.txt.tera similarity index 100% rename from contrib/tests/templates/tera/base.txt.tera rename to contrib/lib/tests/templates/tera/base.txt.tera diff --git a/contrib/tests/templates/tera/html_test.html.tera b/contrib/lib/tests/templates/tera/html_test.html.tera similarity index 100% rename from contrib/tests/templates/tera/html_test.html.tera rename to contrib/lib/tests/templates/tera/html_test.html.tera diff --git a/contrib/tests/templates/tera/txt_test.txt.tera b/contrib/lib/tests/templates/tera/txt_test.txt.tera similarity index 100% rename from contrib/tests/templates/tera/txt_test.txt.tera rename to contrib/lib/tests/templates/tera/txt_test.txt.tera diff --git a/codegen/Cargo.toml b/core/codegen/Cargo.toml similarity index 100% rename from codegen/Cargo.toml rename to core/codegen/Cargo.toml diff --git a/codegen/build.rs b/core/codegen/build.rs similarity index 100% rename from codegen/build.rs rename to core/codegen/build.rs diff --git a/codegen/src/decorators/catch.rs b/core/codegen/src/decorators/catch.rs similarity index 100% rename from codegen/src/decorators/catch.rs rename to core/codegen/src/decorators/catch.rs diff --git a/codegen/src/decorators/derive_form.rs b/core/codegen/src/decorators/derive_form.rs similarity index 100% rename from codegen/src/decorators/derive_form.rs rename to core/codegen/src/decorators/derive_form.rs diff --git a/codegen/src/decorators/mod.rs b/core/codegen/src/decorators/mod.rs similarity index 100% rename from codegen/src/decorators/mod.rs rename to core/codegen/src/decorators/mod.rs diff --git a/codegen/src/decorators/route.rs b/core/codegen/src/decorators/route.rs similarity index 100% rename from codegen/src/decorators/route.rs rename to core/codegen/src/decorators/route.rs diff --git a/codegen/src/lib.rs b/core/codegen/src/lib.rs similarity index 100% rename from codegen/src/lib.rs rename to core/codegen/src/lib.rs diff --git a/codegen/src/macros/mod.rs b/core/codegen/src/macros/mod.rs similarity index 100% rename from codegen/src/macros/mod.rs rename to core/codegen/src/macros/mod.rs diff --git a/codegen/src/macros/uri.rs b/core/codegen/src/macros/uri.rs similarity index 100% rename from codegen/src/macros/uri.rs rename to core/codegen/src/macros/uri.rs diff --git a/codegen/src/parser/catch.rs b/core/codegen/src/parser/catch.rs similarity index 100% rename from codegen/src/parser/catch.rs rename to core/codegen/src/parser/catch.rs diff --git a/codegen/src/parser/function.rs b/core/codegen/src/parser/function.rs similarity index 100% rename from codegen/src/parser/function.rs rename to core/codegen/src/parser/function.rs diff --git a/codegen/src/parser/keyvalue.rs b/core/codegen/src/parser/keyvalue.rs similarity index 100% rename from codegen/src/parser/keyvalue.rs rename to core/codegen/src/parser/keyvalue.rs diff --git a/codegen/src/parser/mod.rs b/core/codegen/src/parser/mod.rs similarity index 100% rename from codegen/src/parser/mod.rs rename to core/codegen/src/parser/mod.rs diff --git a/codegen/src/parser/param.rs b/core/codegen/src/parser/param.rs similarity index 100% rename from codegen/src/parser/param.rs rename to core/codegen/src/parser/param.rs diff --git a/codegen/src/parser/route.rs b/core/codegen/src/parser/route.rs similarity index 100% rename from codegen/src/parser/route.rs rename to core/codegen/src/parser/route.rs diff --git a/codegen/src/parser/uri.rs b/core/codegen/src/parser/uri.rs similarity index 100% rename from codegen/src/parser/uri.rs rename to core/codegen/src/parser/uri.rs diff --git a/codegen/src/parser/uri_macro.rs b/core/codegen/src/parser/uri_macro.rs similarity index 100% rename from codegen/src/parser/uri_macro.rs rename to core/codegen/src/parser/uri_macro.rs diff --git a/codegen/src/utils/arg_ext.rs b/core/codegen/src/utils/arg_ext.rs similarity index 100% rename from codegen/src/utils/arg_ext.rs rename to core/codegen/src/utils/arg_ext.rs diff --git a/codegen/src/utils/expr_ext.rs b/core/codegen/src/utils/expr_ext.rs similarity index 100% rename from codegen/src/utils/expr_ext.rs rename to core/codegen/src/utils/expr_ext.rs diff --git a/codegen/src/utils/ident_ext.rs b/core/codegen/src/utils/ident_ext.rs similarity index 100% rename from codegen/src/utils/ident_ext.rs rename to core/codegen/src/utils/ident_ext.rs diff --git a/codegen/src/utils/meta_item_ext.rs b/core/codegen/src/utils/meta_item_ext.rs similarity index 100% rename from codegen/src/utils/meta_item_ext.rs rename to core/codegen/src/utils/meta_item_ext.rs diff --git a/codegen/src/utils/mod.rs b/core/codegen/src/utils/mod.rs similarity index 100% rename from codegen/src/utils/mod.rs rename to core/codegen/src/utils/mod.rs diff --git a/codegen/src/utils/parser_ext.rs b/core/codegen/src/utils/parser_ext.rs similarity index 100% rename from codegen/src/utils/parser_ext.rs rename to core/codegen/src/utils/parser_ext.rs diff --git a/codegen/src/utils/span_ext.rs b/core/codegen/src/utils/span_ext.rs similarity index 100% rename from codegen/src/utils/span_ext.rs rename to core/codegen/src/utils/span_ext.rs diff --git a/codegen/tests/compile-fail/absolute-mount-paths.rs b/core/codegen/tests/compile-fail/absolute-mount-paths.rs similarity index 100% rename from codegen/tests/compile-fail/absolute-mount-paths.rs rename to core/codegen/tests/compile-fail/absolute-mount-paths.rs diff --git a/codegen/tests/compile-fail/bad-attribute-form.rs b/core/codegen/tests/compile-fail/bad-attribute-form.rs similarity index 100% rename from codegen/tests/compile-fail/bad-attribute-form.rs rename to core/codegen/tests/compile-fail/bad-attribute-form.rs diff --git a/codegen/tests/compile-fail/bad-attribute-param.rs b/core/codegen/tests/compile-fail/bad-attribute-param.rs similarity index 100% rename from codegen/tests/compile-fail/bad-attribute-param.rs rename to core/codegen/tests/compile-fail/bad-attribute-param.rs diff --git a/codegen/tests/compile-fail/bad-ident-argument.rs b/core/codegen/tests/compile-fail/bad-ident-argument.rs similarity index 100% rename from codegen/tests/compile-fail/bad-ident-argument.rs rename to core/codegen/tests/compile-fail/bad-ident-argument.rs diff --git a/codegen/tests/compile-fail/bad-value-types-in-attribute.rs b/core/codegen/tests/compile-fail/bad-value-types-in-attribute.rs similarity index 100% rename from codegen/tests/compile-fail/bad-value-types-in-attribute.rs rename to core/codegen/tests/compile-fail/bad-value-types-in-attribute.rs diff --git a/codegen/tests/compile-fail/decorate-enum.rs b/core/codegen/tests/compile-fail/decorate-enum.rs similarity index 100% rename from codegen/tests/compile-fail/decorate-enum.rs rename to core/codegen/tests/compile-fail/decorate-enum.rs diff --git a/codegen/tests/compile-fail/decorate-impl.rs b/core/codegen/tests/compile-fail/decorate-impl.rs similarity index 100% rename from codegen/tests/compile-fail/decorate-impl.rs rename to core/codegen/tests/compile-fail/decorate-impl.rs diff --git a/codegen/tests/compile-fail/decorate-struct.rs b/core/codegen/tests/compile-fail/decorate-struct.rs similarity index 100% rename from codegen/tests/compile-fail/decorate-struct.rs rename to core/codegen/tests/compile-fail/decorate-struct.rs diff --git a/codegen/tests/compile-fail/decorate-trait.rs b/core/codegen/tests/compile-fail/decorate-trait.rs similarity index 100% rename from codegen/tests/compile-fail/decorate-trait.rs rename to core/codegen/tests/compile-fail/decorate-trait.rs diff --git a/codegen/tests/compile-fail/empty-segments.rs b/core/codegen/tests/compile-fail/empty-segments.rs similarity index 100% rename from codegen/tests/compile-fail/empty-segments.rs rename to core/codegen/tests/compile-fail/empty-segments.rs diff --git a/codegen/tests/compile-fail/form-field-attr.rs b/core/codegen/tests/compile-fail/form-field-attr.rs similarity index 100% rename from codegen/tests/compile-fail/form-field-attr.rs rename to core/codegen/tests/compile-fail/form-field-attr.rs diff --git a/codegen/tests/compile-fail/ignored_params.rs b/core/codegen/tests/compile-fail/ignored_params.rs similarity index 100% rename from codegen/tests/compile-fail/ignored_params.rs rename to core/codegen/tests/compile-fail/ignored_params.rs diff --git a/codegen/tests/compile-fail/malformed-media-type.rs b/core/codegen/tests/compile-fail/malformed-media-type.rs similarity index 100% rename from codegen/tests/compile-fail/malformed-media-type.rs rename to core/codegen/tests/compile-fail/malformed-media-type.rs diff --git a/codegen/tests/compile-fail/phantom-declared-param.rs b/core/codegen/tests/compile-fail/phantom-declared-param.rs similarity index 100% rename from codegen/tests/compile-fail/phantom-declared-param.rs rename to core/codegen/tests/compile-fail/phantom-declared-param.rs diff --git a/codegen/tests/compile-fail/unknown-attribute-param.rs b/core/codegen/tests/compile-fail/unknown-attribute-param.rs similarity index 100% rename from codegen/tests/compile-fail/unknown-attribute-param.rs rename to core/codegen/tests/compile-fail/unknown-attribute-param.rs diff --git a/codegen/tests/compile-fail/unknown-media-type.rs b/core/codegen/tests/compile-fail/unknown-media-type.rs similarity index 100% rename from codegen/tests/compile-fail/unknown-media-type.rs rename to core/codegen/tests/compile-fail/unknown-media-type.rs diff --git a/codegen/tests/compiletest.rs b/core/codegen/tests/compiletest.rs similarity index 98% rename from codegen/tests/compiletest.rs rename to core/codegen/tests/compiletest.rs index 1dd32897..f54f3abb 100644 --- a/codegen/tests/compiletest.rs +++ b/core/codegen/tests/compiletest.rs @@ -29,7 +29,7 @@ fn target_path() -> PathBuf { #[cfg(not(debug_assertions))] const ENVIRONMENT: &str = "release"; Path::new(env!("CARGO_MANIFEST_DIR")) - .parent().unwrap() + .parent().unwrap().parent().unwrap() .join("target") .join(ENVIRONMENT) } diff --git a/codegen/tests/complete-decorator.rs b/core/codegen/tests/complete-decorator.rs similarity index 100% rename from codegen/tests/complete-decorator.rs rename to core/codegen/tests/complete-decorator.rs diff --git a/codegen/tests/custom-content-type.rs b/core/codegen/tests/custom-content-type.rs similarity index 100% rename from codegen/tests/custom-content-type.rs rename to core/codegen/tests/custom-content-type.rs diff --git a/codegen/tests/derive_form.rs b/core/codegen/tests/derive_form.rs similarity index 100% rename from codegen/tests/derive_form.rs rename to core/codegen/tests/derive_form.rs diff --git a/codegen/tests/dynamic-paths.rs b/core/codegen/tests/dynamic-paths.rs similarity index 100% rename from codegen/tests/dynamic-paths.rs rename to core/codegen/tests/dynamic-paths.rs diff --git a/codegen/tests/empty-fn.rs b/core/codegen/tests/empty-fn.rs similarity index 100% rename from codegen/tests/empty-fn.rs rename to core/codegen/tests/empty-fn.rs diff --git a/codegen/tests/empty_form.rs b/core/codegen/tests/empty_form.rs similarity index 100% rename from codegen/tests/empty_form.rs rename to core/codegen/tests/empty_form.rs diff --git a/codegen/tests/error-handler.rs b/core/codegen/tests/error-handler.rs similarity index 100% rename from codegen/tests/error-handler.rs rename to core/codegen/tests/error-handler.rs diff --git a/codegen/tests/form-field-rename.rs b/core/codegen/tests/form-field-rename.rs similarity index 100% rename from codegen/tests/form-field-rename.rs rename to core/codegen/tests/form-field-rename.rs diff --git a/codegen/tests/instanced-mounting.rs b/core/codegen/tests/instanced-mounting.rs similarity index 100% rename from codegen/tests/instanced-mounting.rs rename to core/codegen/tests/instanced-mounting.rs diff --git a/codegen/tests/issue-1-colliding-names.rs b/core/codegen/tests/issue-1-colliding-names.rs similarity index 100% rename from codegen/tests/issue-1-colliding-names.rs rename to core/codegen/tests/issue-1-colliding-names.rs diff --git a/codegen/tests/methods.rs b/core/codegen/tests/methods.rs similarity index 100% rename from codegen/tests/methods.rs rename to core/codegen/tests/methods.rs diff --git a/codegen/tests/rank_decorator.rs b/core/codegen/tests/rank_decorator.rs similarity index 100% rename from codegen/tests/rank_decorator.rs rename to core/codegen/tests/rank_decorator.rs diff --git a/codegen/tests/refactored_rocket_no_lint_errors.rs b/core/codegen/tests/refactored_rocket_no_lint_errors.rs similarity index 100% rename from codegen/tests/refactored_rocket_no_lint_errors.rs rename to core/codegen/tests/refactored_rocket_no_lint_errors.rs diff --git a/codegen/tests/segments.rs b/core/codegen/tests/segments.rs similarity index 100% rename from codegen/tests/segments.rs rename to core/codegen/tests/segments.rs diff --git a/codegen/tests/type-alias-lints.rs b/core/codegen/tests/type-alias-lints.rs similarity index 100% rename from codegen/tests/type-alias-lints.rs rename to core/codegen/tests/type-alias-lints.rs diff --git a/codegen/tests/typed-uris.rs b/core/codegen/tests/typed-uris.rs similarity index 100% rename from codegen/tests/typed-uris.rs rename to core/codegen/tests/typed-uris.rs diff --git a/codegen/tests/ui/bad-error-fn.rs b/core/codegen/tests/ui/bad-error-fn.rs similarity index 100% rename from codegen/tests/ui/bad-error-fn.rs rename to core/codegen/tests/ui/bad-error-fn.rs diff --git a/codegen/tests/ui/bad-error-fn.stderr b/core/codegen/tests/ui/bad-error-fn.stderr similarity index 100% rename from codegen/tests/ui/bad-error-fn.stderr rename to core/codegen/tests/ui/bad-error-fn.stderr diff --git a/codegen/tests/ui/data-without-post.rs b/core/codegen/tests/ui/data-without-post.rs similarity index 100% rename from codegen/tests/ui/data-without-post.rs rename to core/codegen/tests/ui/data-without-post.rs diff --git a/codegen/tests/ui/data-without-post.stderr b/core/codegen/tests/ui/data-without-post.stderr similarity index 100% rename from codegen/tests/ui/data-without-post.stderr rename to core/codegen/tests/ui/data-without-post.stderr diff --git a/codegen/tests/ui/malformed-param-list.rs b/core/codegen/tests/ui/malformed-param-list.rs similarity index 100% rename from codegen/tests/ui/malformed-param-list.rs rename to core/codegen/tests/ui/malformed-param-list.rs diff --git a/codegen/tests/ui/malformed-param-list.stderr b/core/codegen/tests/ui/malformed-param-list.stderr similarity index 100% rename from codegen/tests/ui/malformed-param-list.stderr rename to core/codegen/tests/ui/malformed-param-list.stderr diff --git a/codegen/tests/ui/route-bad-method.rs b/core/codegen/tests/ui/route-bad-method.rs similarity index 100% rename from codegen/tests/ui/route-bad-method.rs rename to core/codegen/tests/ui/route-bad-method.rs diff --git a/codegen/tests/ui/route-bad-method.stderr b/core/codegen/tests/ui/route-bad-method.stderr similarity index 100% rename from codegen/tests/ui/route-bad-method.stderr rename to core/codegen/tests/ui/route-bad-method.stderr diff --git a/codegen/tests/ui/typed-uri-bad-type.rs b/core/codegen/tests/ui/typed-uri-bad-type.rs similarity index 100% rename from codegen/tests/ui/typed-uri-bad-type.rs rename to core/codegen/tests/ui/typed-uri-bad-type.rs diff --git a/codegen/tests/ui/typed-uri-bad-type.stderr b/core/codegen/tests/ui/typed-uri-bad-type.stderr similarity index 100% rename from codegen/tests/ui/typed-uri-bad-type.stderr rename to core/codegen/tests/ui/typed-uri-bad-type.stderr diff --git a/codegen/tests/ui/typed-uris-bad-params.rs b/core/codegen/tests/ui/typed-uris-bad-params.rs similarity index 100% rename from codegen/tests/ui/typed-uris-bad-params.rs rename to core/codegen/tests/ui/typed-uris-bad-params.rs diff --git a/codegen/tests/ui/typed-uris-bad-params.stderr b/core/codegen/tests/ui/typed-uris-bad-params.stderr similarity index 100% rename from codegen/tests/ui/typed-uris-bad-params.stderr rename to core/codegen/tests/ui/typed-uris-bad-params.stderr diff --git a/codegen/tests/ui/typed-uris-invalid-syntax.rs b/core/codegen/tests/ui/typed-uris-invalid-syntax.rs similarity index 100% rename from codegen/tests/ui/typed-uris-invalid-syntax.rs rename to core/codegen/tests/ui/typed-uris-invalid-syntax.rs diff --git a/codegen/tests/ui/typed-uris-invalid-syntax.stderr b/core/codegen/tests/ui/typed-uris-invalid-syntax.stderr similarity index 100% rename from codegen/tests/ui/typed-uris-invalid-syntax.stderr rename to core/codegen/tests/ui/typed-uris-invalid-syntax.stderr diff --git a/codegen_next/Cargo.toml b/core/codegen_next/Cargo.toml similarity index 91% rename from codegen_next/Cargo.toml rename to core/codegen_next/Cargo.toml index 693342bb..dc964903 100644 --- a/codegen_next/Cargo.toml +++ b/core/codegen_next/Cargo.toml @@ -10,6 +10,9 @@ readme = "../README.md" keywords = ["rocket", "web", "framework", "code", "generation"] license = "MIT/Apache-2.0" +# if publishing, add to config scripts +publish = false + [lib] proc-macro = true diff --git a/codegen_next/src/codegen_ext.rs b/core/codegen_next/src/codegen_ext.rs similarity index 100% rename from codegen_next/src/codegen_ext.rs rename to core/codegen_next/src/codegen_ext.rs diff --git a/codegen_next/src/ext.rs b/core/codegen_next/src/ext.rs similarity index 100% rename from codegen_next/src/ext.rs rename to core/codegen_next/src/ext.rs diff --git a/codegen_next/src/lib.rs b/core/codegen_next/src/lib.rs similarity index 100% rename from codegen_next/src/lib.rs rename to core/codegen_next/src/lib.rs diff --git a/codegen_next/src/parser.rs b/core/codegen_next/src/parser.rs similarity index 100% rename from codegen_next/src/parser.rs rename to core/codegen_next/src/parser.rs diff --git a/codegen_next/src/spanned.rs b/core/codegen_next/src/spanned.rs similarity index 100% rename from codegen_next/src/spanned.rs rename to core/codegen_next/src/spanned.rs diff --git a/lib/Cargo.toml b/core/lib/Cargo.toml similarity index 100% rename from lib/Cargo.toml rename to core/lib/Cargo.toml diff --git a/lib/benches/format-routing.rs b/core/lib/benches/format-routing.rs similarity index 100% rename from lib/benches/format-routing.rs rename to core/lib/benches/format-routing.rs diff --git a/lib/benches/ranked-routing.rs b/core/lib/benches/ranked-routing.rs similarity index 100% rename from lib/benches/ranked-routing.rs rename to core/lib/benches/ranked-routing.rs diff --git a/lib/benches/simple-routing.rs b/core/lib/benches/simple-routing.rs similarity index 100% rename from lib/benches/simple-routing.rs rename to core/lib/benches/simple-routing.rs diff --git a/lib/build.rs b/core/lib/build.rs similarity index 100% rename from lib/build.rs rename to core/lib/build.rs diff --git a/lib/src/catcher.rs b/core/lib/src/catcher.rs similarity index 100% rename from lib/src/catcher.rs rename to core/lib/src/catcher.rs diff --git a/lib/src/codegen.rs b/core/lib/src/codegen.rs similarity index 100% rename from lib/src/codegen.rs rename to core/lib/src/codegen.rs diff --git a/lib/src/config/builder.rs b/core/lib/src/config/builder.rs similarity index 100% rename from lib/src/config/builder.rs rename to core/lib/src/config/builder.rs diff --git a/lib/src/config/config.rs b/core/lib/src/config/config.rs similarity index 100% rename from lib/src/config/config.rs rename to core/lib/src/config/config.rs diff --git a/lib/src/config/custom_values.rs b/core/lib/src/config/custom_values.rs similarity index 100% rename from lib/src/config/custom_values.rs rename to core/lib/src/config/custom_values.rs diff --git a/lib/src/config/environment.rs b/core/lib/src/config/environment.rs similarity index 100% rename from lib/src/config/environment.rs rename to core/lib/src/config/environment.rs diff --git a/lib/src/config/error.rs b/core/lib/src/config/error.rs similarity index 100% rename from lib/src/config/error.rs rename to core/lib/src/config/error.rs diff --git a/lib/src/config/mod.rs b/core/lib/src/config/mod.rs similarity index 100% rename from lib/src/config/mod.rs rename to core/lib/src/config/mod.rs diff --git a/lib/src/config/toml_ext.rs b/core/lib/src/config/toml_ext.rs similarity index 100% rename from lib/src/config/toml_ext.rs rename to core/lib/src/config/toml_ext.rs diff --git a/lib/src/data/data.rs b/core/lib/src/data/data.rs similarity index 100% rename from lib/src/data/data.rs rename to core/lib/src/data/data.rs diff --git a/lib/src/data/data_stream.rs b/core/lib/src/data/data_stream.rs similarity index 100% rename from lib/src/data/data_stream.rs rename to core/lib/src/data/data_stream.rs diff --git a/lib/src/data/from_data.rs b/core/lib/src/data/from_data.rs similarity index 100% rename from lib/src/data/from_data.rs rename to core/lib/src/data/from_data.rs diff --git a/lib/src/data/mod.rs b/core/lib/src/data/mod.rs similarity index 100% rename from lib/src/data/mod.rs rename to core/lib/src/data/mod.rs diff --git a/lib/src/data/net_stream.rs b/core/lib/src/data/net_stream.rs similarity index 100% rename from lib/src/data/net_stream.rs rename to core/lib/src/data/net_stream.rs diff --git a/lib/src/docify.rs b/core/lib/src/docify.rs similarity index 100% rename from lib/src/docify.rs rename to core/lib/src/docify.rs diff --git a/lib/src/error.rs b/core/lib/src/error.rs similarity index 100% rename from lib/src/error.rs rename to core/lib/src/error.rs diff --git a/lib/src/ext.rs b/core/lib/src/ext.rs similarity index 100% rename from lib/src/ext.rs rename to core/lib/src/ext.rs diff --git a/lib/src/fairing/ad_hoc.rs b/core/lib/src/fairing/ad_hoc.rs similarity index 100% rename from lib/src/fairing/ad_hoc.rs rename to core/lib/src/fairing/ad_hoc.rs diff --git a/lib/src/fairing/fairings.rs b/core/lib/src/fairing/fairings.rs similarity index 100% rename from lib/src/fairing/fairings.rs rename to core/lib/src/fairing/fairings.rs diff --git a/lib/src/fairing/info_kind.rs b/core/lib/src/fairing/info_kind.rs similarity index 100% rename from lib/src/fairing/info_kind.rs rename to core/lib/src/fairing/info_kind.rs diff --git a/lib/src/fairing/mod.rs b/core/lib/src/fairing/mod.rs similarity index 100% rename from lib/src/fairing/mod.rs rename to core/lib/src/fairing/mod.rs diff --git a/lib/src/handler.rs b/core/lib/src/handler.rs similarity index 100% rename from lib/src/handler.rs rename to core/lib/src/handler.rs diff --git a/lib/src/http/accept.rs b/core/lib/src/http/accept.rs similarity index 100% rename from lib/src/http/accept.rs rename to core/lib/src/http/accept.rs diff --git a/lib/src/http/content_type.rs b/core/lib/src/http/content_type.rs similarity index 100% rename from lib/src/http/content_type.rs rename to core/lib/src/http/content_type.rs diff --git a/lib/src/http/cookies.rs b/core/lib/src/http/cookies.rs similarity index 100% rename from lib/src/http/cookies.rs rename to core/lib/src/http/cookies.rs diff --git a/lib/src/http/header.rs b/core/lib/src/http/header.rs similarity index 100% rename from lib/src/http/header.rs rename to core/lib/src/http/header.rs diff --git a/lib/src/http/hyper.rs b/core/lib/src/http/hyper.rs similarity index 100% rename from lib/src/http/hyper.rs rename to core/lib/src/http/hyper.rs diff --git a/lib/src/http/known_media_types.rs b/core/lib/src/http/known_media_types.rs similarity index 100% rename from lib/src/http/known_media_types.rs rename to core/lib/src/http/known_media_types.rs diff --git a/lib/src/http/media_type.rs b/core/lib/src/http/media_type.rs similarity index 100% rename from lib/src/http/media_type.rs rename to core/lib/src/http/media_type.rs diff --git a/lib/src/http/method.rs b/core/lib/src/http/method.rs similarity index 100% rename from lib/src/http/method.rs rename to core/lib/src/http/method.rs diff --git a/lib/src/http/mod.rs b/core/lib/src/http/mod.rs similarity index 100% rename from lib/src/http/mod.rs rename to core/lib/src/http/mod.rs diff --git a/lib/src/http/parse/accept.rs b/core/lib/src/http/parse/accept.rs similarity index 100% rename from lib/src/http/parse/accept.rs rename to core/lib/src/http/parse/accept.rs diff --git a/lib/src/http/parse/checkers.rs b/core/lib/src/http/parse/checkers.rs similarity index 100% rename from lib/src/http/parse/checkers.rs rename to core/lib/src/http/parse/checkers.rs diff --git a/lib/src/http/parse/indexed_str.rs b/core/lib/src/http/parse/indexed_str.rs similarity index 100% rename from lib/src/http/parse/indexed_str.rs rename to core/lib/src/http/parse/indexed_str.rs diff --git a/lib/src/http/parse/media_type.rs b/core/lib/src/http/parse/media_type.rs similarity index 100% rename from lib/src/http/parse/media_type.rs rename to core/lib/src/http/parse/media_type.rs diff --git a/lib/src/http/parse/mod.rs b/core/lib/src/http/parse/mod.rs similarity index 100% rename from lib/src/http/parse/mod.rs rename to core/lib/src/http/parse/mod.rs diff --git a/lib/src/http/raw_str.rs b/core/lib/src/http/raw_str.rs similarity index 100% rename from lib/src/http/raw_str.rs rename to core/lib/src/http/raw_str.rs diff --git a/lib/src/http/status.rs b/core/lib/src/http/status.rs similarity index 100% rename from lib/src/http/status.rs rename to core/lib/src/http/status.rs diff --git a/lib/src/http/uncased.rs b/core/lib/src/http/uncased.rs similarity index 100% rename from lib/src/http/uncased.rs rename to core/lib/src/http/uncased.rs diff --git a/lib/src/http/uri/from_uri_param.rs b/core/lib/src/http/uri/from_uri_param.rs similarity index 100% rename from lib/src/http/uri/from_uri_param.rs rename to core/lib/src/http/uri/from_uri_param.rs diff --git a/lib/src/http/uri/mod.rs b/core/lib/src/http/uri/mod.rs similarity index 100% rename from lib/src/http/uri/mod.rs rename to core/lib/src/http/uri/mod.rs diff --git a/lib/src/http/uri/uri.rs b/core/lib/src/http/uri/uri.rs similarity index 100% rename from lib/src/http/uri/uri.rs rename to core/lib/src/http/uri/uri.rs diff --git a/lib/src/http/uri/uri_display.rs b/core/lib/src/http/uri/uri_display.rs similarity index 100% rename from lib/src/http/uri/uri_display.rs rename to core/lib/src/http/uri/uri_display.rs diff --git a/lib/src/lib.rs b/core/lib/src/lib.rs similarity index 100% rename from lib/src/lib.rs rename to core/lib/src/lib.rs diff --git a/lib/src/local/client.rs b/core/lib/src/local/client.rs similarity index 100% rename from lib/src/local/client.rs rename to core/lib/src/local/client.rs diff --git a/lib/src/local/mod.rs b/core/lib/src/local/mod.rs similarity index 100% rename from lib/src/local/mod.rs rename to core/lib/src/local/mod.rs diff --git a/lib/src/local/request.rs b/core/lib/src/local/request.rs similarity index 100% rename from lib/src/local/request.rs rename to core/lib/src/local/request.rs diff --git a/lib/src/logger.rs b/core/lib/src/logger.rs similarity index 100% rename from lib/src/logger.rs rename to core/lib/src/logger.rs diff --git a/lib/src/outcome.rs b/core/lib/src/outcome.rs similarity index 100% rename from lib/src/outcome.rs rename to core/lib/src/outcome.rs diff --git a/lib/src/request/form/form.rs b/core/lib/src/request/form/form.rs similarity index 100% rename from lib/src/request/form/form.rs rename to core/lib/src/request/form/form.rs diff --git a/lib/src/request/form/form_items.rs b/core/lib/src/request/form/form_items.rs similarity index 100% rename from lib/src/request/form/form_items.rs rename to core/lib/src/request/form/form_items.rs diff --git a/lib/src/request/form/from_form.rs b/core/lib/src/request/form/from_form.rs similarity index 100% rename from lib/src/request/form/from_form.rs rename to core/lib/src/request/form/from_form.rs diff --git a/lib/src/request/form/from_form_value.rs b/core/lib/src/request/form/from_form_value.rs similarity index 100% rename from lib/src/request/form/from_form_value.rs rename to core/lib/src/request/form/from_form_value.rs diff --git a/lib/src/request/form/lenient.rs b/core/lib/src/request/form/lenient.rs similarity index 100% rename from lib/src/request/form/lenient.rs rename to core/lib/src/request/form/lenient.rs diff --git a/lib/src/request/form/mod.rs b/core/lib/src/request/form/mod.rs similarity index 100% rename from lib/src/request/form/mod.rs rename to core/lib/src/request/form/mod.rs diff --git a/lib/src/request/from_request.rs b/core/lib/src/request/from_request.rs similarity index 100% rename from lib/src/request/from_request.rs rename to core/lib/src/request/from_request.rs diff --git a/lib/src/request/mod.rs b/core/lib/src/request/mod.rs similarity index 100% rename from lib/src/request/mod.rs rename to core/lib/src/request/mod.rs diff --git a/lib/src/request/param.rs b/core/lib/src/request/param.rs similarity index 100% rename from lib/src/request/param.rs rename to core/lib/src/request/param.rs diff --git a/lib/src/request/request.rs b/core/lib/src/request/request.rs similarity index 100% rename from lib/src/request/request.rs rename to core/lib/src/request/request.rs diff --git a/lib/src/request/state.rs b/core/lib/src/request/state.rs similarity index 100% rename from lib/src/request/state.rs rename to core/lib/src/request/state.rs diff --git a/lib/src/request/tests.rs b/core/lib/src/request/tests.rs similarity index 100% rename from lib/src/request/tests.rs rename to core/lib/src/request/tests.rs diff --git a/lib/src/response/content.rs b/core/lib/src/response/content.rs similarity index 100% rename from lib/src/response/content.rs rename to core/lib/src/response/content.rs diff --git a/lib/src/response/failure.rs b/core/lib/src/response/failure.rs similarity index 100% rename from lib/src/response/failure.rs rename to core/lib/src/response/failure.rs diff --git a/lib/src/response/flash.rs b/core/lib/src/response/flash.rs similarity index 100% rename from lib/src/response/flash.rs rename to core/lib/src/response/flash.rs diff --git a/lib/src/response/mod.rs b/core/lib/src/response/mod.rs similarity index 100% rename from lib/src/response/mod.rs rename to core/lib/src/response/mod.rs diff --git a/lib/src/response/named_file.rs b/core/lib/src/response/named_file.rs similarity index 100% rename from lib/src/response/named_file.rs rename to core/lib/src/response/named_file.rs diff --git a/lib/src/response/redirect.rs b/core/lib/src/response/redirect.rs similarity index 100% rename from lib/src/response/redirect.rs rename to core/lib/src/response/redirect.rs diff --git a/lib/src/response/responder.rs b/core/lib/src/response/responder.rs similarity index 100% rename from lib/src/response/responder.rs rename to core/lib/src/response/responder.rs diff --git a/lib/src/response/response.rs b/core/lib/src/response/response.rs similarity index 100% rename from lib/src/response/response.rs rename to core/lib/src/response/response.rs diff --git a/lib/src/response/status.rs b/core/lib/src/response/status.rs similarity index 100% rename from lib/src/response/status.rs rename to core/lib/src/response/status.rs diff --git a/lib/src/response/stream.rs b/core/lib/src/response/stream.rs similarity index 100% rename from lib/src/response/stream.rs rename to core/lib/src/response/stream.rs diff --git a/lib/src/rocket.rs b/core/lib/src/rocket.rs similarity index 100% rename from lib/src/rocket.rs rename to core/lib/src/rocket.rs diff --git a/lib/src/router/collider.rs b/core/lib/src/router/collider.rs similarity index 100% rename from lib/src/router/collider.rs rename to core/lib/src/router/collider.rs diff --git a/lib/src/router/mod.rs b/core/lib/src/router/mod.rs similarity index 100% rename from lib/src/router/mod.rs rename to core/lib/src/router/mod.rs diff --git a/lib/src/router/route.rs b/core/lib/src/router/route.rs similarity index 100% rename from lib/src/router/route.rs rename to core/lib/src/router/route.rs diff --git a/lib/tests/fairing_before_head_strip-issue-546.rs b/core/lib/tests/fairing_before_head_strip-issue-546.rs similarity index 100% rename from lib/tests/fairing_before_head_strip-issue-546.rs rename to core/lib/tests/fairing_before_head_strip-issue-546.rs diff --git a/lib/tests/flash-lazy-removes-issue-466.rs b/core/lib/tests/flash-lazy-removes-issue-466.rs similarity index 100% rename from lib/tests/flash-lazy-removes-issue-466.rs rename to core/lib/tests/flash-lazy-removes-issue-466.rs diff --git a/lib/tests/form_method-issue-45.rs b/core/lib/tests/form_method-issue-45.rs similarity index 100% rename from lib/tests/form_method-issue-45.rs rename to core/lib/tests/form_method-issue-45.rs diff --git a/lib/tests/form_value_decoding-issue-82.rs b/core/lib/tests/form_value_decoding-issue-82.rs similarity index 100% rename from lib/tests/form_value_decoding-issue-82.rs rename to core/lib/tests/form_value_decoding-issue-82.rs diff --git a/lib/tests/head_handling.rs b/core/lib/tests/head_handling.rs similarity index 100% rename from lib/tests/head_handling.rs rename to core/lib/tests/head_handling.rs diff --git a/lib/tests/limits.rs b/core/lib/tests/limits.rs similarity index 100% rename from lib/tests/limits.rs rename to core/lib/tests/limits.rs diff --git a/lib/tests/local-request-content-type-issue-505.rs b/core/lib/tests/local-request-content-type-issue-505.rs similarity index 100% rename from lib/tests/local-request-content-type-issue-505.rs rename to core/lib/tests/local-request-content-type-issue-505.rs diff --git a/lib/tests/local_request_private_cookie-issue-368.rs b/core/lib/tests/local_request_private_cookie-issue-368.rs similarity index 100% rename from lib/tests/local_request_private_cookie-issue-368.rs rename to core/lib/tests/local_request_private_cookie-issue-368.rs diff --git a/lib/tests/mount_point.rs b/core/lib/tests/mount_point.rs similarity index 100% rename from lib/tests/mount_point.rs rename to core/lib/tests/mount_point.rs diff --git a/lib/tests/nested-fairing-attaches.rs b/core/lib/tests/nested-fairing-attaches.rs similarity index 100% rename from lib/tests/nested-fairing-attaches.rs rename to core/lib/tests/nested-fairing-attaches.rs diff --git a/lib/tests/precise-content-type-matching.rs b/core/lib/tests/precise-content-type-matching.rs similarity index 100% rename from lib/tests/precise-content-type-matching.rs rename to core/lib/tests/precise-content-type-matching.rs diff --git a/lib/tests/query-and-non-query-dont-collide.rs b/core/lib/tests/query-and-non-query-dont-collide.rs similarity index 100% rename from lib/tests/query-and-non-query-dont-collide.rs rename to core/lib/tests/query-and-non-query-dont-collide.rs diff --git a/lib/tests/redirect_from_catcher-issue-113.rs b/core/lib/tests/redirect_from_catcher-issue-113.rs similarity index 100% rename from lib/tests/redirect_from_catcher-issue-113.rs rename to core/lib/tests/redirect_from_catcher-issue-113.rs diff --git a/lib/tests/responder_lifetime-issue-345.rs b/core/lib/tests/responder_lifetime-issue-345.rs similarity index 100% rename from lib/tests/responder_lifetime-issue-345.rs rename to core/lib/tests/responder_lifetime-issue-345.rs diff --git a/lib/tests/route_guard.rs b/core/lib/tests/route_guard.rs similarity index 100% rename from lib/tests/route_guard.rs rename to core/lib/tests/route_guard.rs diff --git a/lib/tests/segments-issues-41-86.rs b/core/lib/tests/segments-issues-41-86.rs similarity index 100% rename from lib/tests/segments-issues-41-86.rs rename to core/lib/tests/segments-issues-41-86.rs diff --git a/lib/tests/strict_and_lenient_forms.rs b/core/lib/tests/strict_and_lenient_forms.rs similarity index 100% rename from lib/tests/strict_and_lenient_forms.rs rename to core/lib/tests/strict_and_lenient_forms.rs diff --git a/examples/config/Cargo.toml b/examples/config/Cargo.toml index dc5343ce..a344354a 100644 --- a/examples/config/Cargo.toml +++ b/examples/config/Cargo.toml @@ -2,7 +2,8 @@ name = "config" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/content_types/Cargo.toml b/examples/content_types/Cargo.toml index 10d40c78..b0bec566 100644 --- a/examples/content_types/Cargo.toml +++ b/examples/content_types/Cargo.toml @@ -2,10 +2,11 @@ name = "content_types" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } serde = "1.0" serde_json = "1.0" serde_derive = "1.0" diff --git a/examples/cookies/Cargo.toml b/examples/cookies/Cargo.toml index d10f4b89..9af56fe0 100644 --- a/examples/cookies/Cargo.toml +++ b/examples/cookies/Cargo.toml @@ -2,12 +2,13 @@ name = "cookies" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } [dependencies.rocket_contrib] -path = "../../contrib" +path = "../../contrib/lib" default-features = false features = ["handlebars_templates"] diff --git a/examples/errors/Cargo.toml b/examples/errors/Cargo.toml index 2bb7eec2..5ccf2238 100644 --- a/examples/errors/Cargo.toml +++ b/examples/errors/Cargo.toml @@ -2,7 +2,8 @@ name = "errors" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/fairings/Cargo.toml b/examples/fairings/Cargo.toml index 40368ab6..4a270e58 100644 --- a/examples/fairings/Cargo.toml +++ b/examples/fairings/Cargo.toml @@ -2,7 +2,8 @@ name = "fairings" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/form_kitchen_sink/Cargo.toml b/examples/form_kitchen_sink/Cargo.toml index 67f9102e..cb9c8c20 100644 --- a/examples/form_kitchen_sink/Cargo.toml +++ b/examples/form_kitchen_sink/Cargo.toml @@ -2,7 +2,8 @@ name = "form_kitchen_sink" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/form_validation/Cargo.toml b/examples/form_validation/Cargo.toml index 4687cb5c..1c12449f 100644 --- a/examples/form_validation/Cargo.toml +++ b/examples/form_validation/Cargo.toml @@ -2,7 +2,8 @@ name = "form_validation" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/handlebars_templates/Cargo.toml b/examples/handlebars_templates/Cargo.toml index 136e9e61..b3bb5851 100644 --- a/examples/handlebars_templates/Cargo.toml +++ b/examples/handlebars_templates/Cargo.toml @@ -2,15 +2,16 @@ name = "handlebars_templates" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } serde = "1.0" serde_derive = "1.0" serde_json = "1.0" [dependencies.rocket_contrib] -path = "../../contrib" +path = "../../contrib/lib" default-features = false features = ["handlebars_templates"] diff --git a/examples/hello_person/Cargo.toml b/examples/hello_person/Cargo.toml index 6628c1af..a4c71e25 100644 --- a/examples/hello_person/Cargo.toml +++ b/examples/hello_person/Cargo.toml @@ -2,7 +2,8 @@ name = "hello_person" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml index ccd454ee..d0c48988 100644 --- a/examples/hello_world/Cargo.toml +++ b/examples/hello_world/Cargo.toml @@ -2,7 +2,8 @@ name = "hello_world" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/json/Cargo.toml b/examples/json/Cargo.toml index aa2cf6bf..1d705b4d 100644 --- a/examples/json/Cargo.toml +++ b/examples/json/Cargo.toml @@ -2,15 +2,16 @@ name = "json" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } serde = "1.0" serde_json = "1.0" serde_derive = "1.0" [dependencies.rocket_contrib] -path = "../../contrib" +path = "../../contrib/lib" default-features = false features = ["json"] diff --git a/examples/managed_queue/Cargo.toml b/examples/managed_queue/Cargo.toml index 24f7fe59..ccc1c191 100644 --- a/examples/managed_queue/Cargo.toml +++ b/examples/managed_queue/Cargo.toml @@ -2,8 +2,9 @@ name = "managed_queue" version = "0.0.0" workspace = "../.." +publish = false [dependencies] crossbeam = "*" -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/manual_routes/Cargo.toml b/examples/manual_routes/Cargo.toml index af75e891..ba5399a8 100644 --- a/examples/manual_routes/Cargo.toml +++ b/examples/manual_routes/Cargo.toml @@ -2,6 +2,7 @@ name = "manual_routes" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } +rocket = { path = "../../core/lib" } diff --git a/examples/msgpack/Cargo.toml b/examples/msgpack/Cargo.toml index 9e329ca4..d81d7e00 100644 --- a/examples/msgpack/Cargo.toml +++ b/examples/msgpack/Cargo.toml @@ -2,14 +2,15 @@ name = "msgpack" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } serde = "1.0" serde_derive = "1.0" [dependencies.rocket_contrib] -path = "../../contrib" +path = "../../contrib/lib" default-features = false features = ["msgpack"] diff --git a/examples/optional_redirect/Cargo.toml b/examples/optional_redirect/Cargo.toml index e945bd34..60eac15c 100644 --- a/examples/optional_redirect/Cargo.toml +++ b/examples/optional_redirect/Cargo.toml @@ -2,7 +2,8 @@ name = "optional_redirect" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/pastebin/Cargo.toml b/examples/pastebin/Cargo.toml index ee596917..3e1c56a3 100644 --- a/examples/pastebin/Cargo.toml +++ b/examples/pastebin/Cargo.toml @@ -2,8 +2,9 @@ name = "pastebin" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } rand = "0.4" diff --git a/examples/query_params/Cargo.toml b/examples/query_params/Cargo.toml index 0b8c86f6..e37c43a1 100644 --- a/examples/query_params/Cargo.toml +++ b/examples/query_params/Cargo.toml @@ -2,7 +2,8 @@ name = "query_params" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/ranking/Cargo.toml b/examples/ranking/Cargo.toml index 56587bf7..95b61493 100644 --- a/examples/ranking/Cargo.toml +++ b/examples/ranking/Cargo.toml @@ -2,7 +2,8 @@ name = "ranking" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/raw_sqlite/Cargo.toml b/examples/raw_sqlite/Cargo.toml index 8431bd16..589a25bb 100644 --- a/examples/raw_sqlite/Cargo.toml +++ b/examples/raw_sqlite/Cargo.toml @@ -2,8 +2,9 @@ name = "raw_sqlite" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } rusqlite = "0.13" diff --git a/examples/raw_upload/Cargo.toml b/examples/raw_upload/Cargo.toml index d8282040..576fe2ac 100644 --- a/examples/raw_upload/Cargo.toml +++ b/examples/raw_upload/Cargo.toml @@ -2,7 +2,8 @@ name = "raw_upload" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/redirect/Cargo.toml b/examples/redirect/Cargo.toml index 0f38fae7..855c43e3 100644 --- a/examples/redirect/Cargo.toml +++ b/examples/redirect/Cargo.toml @@ -2,7 +2,8 @@ name = "redirect" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/request_guard/Cargo.toml b/examples/request_guard/Cargo.toml index 97c2e92f..5ce6675d 100644 --- a/examples/request_guard/Cargo.toml +++ b/examples/request_guard/Cargo.toml @@ -2,7 +2,8 @@ name = "request_guard" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/session/Cargo.toml b/examples/session/Cargo.toml index 390ef1f6..f8736fdb 100644 --- a/examples/session/Cargo.toml +++ b/examples/session/Cargo.toml @@ -2,12 +2,13 @@ name = "session" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } [dependencies.rocket_contrib] -path = "../../contrib" +path = "../../contrib/lib" default-features = false features = ["handlebars_templates"] diff --git a/examples/state/Cargo.toml b/examples/state/Cargo.toml index 008d3ae7..d3432dda 100644 --- a/examples/state/Cargo.toml +++ b/examples/state/Cargo.toml @@ -2,7 +2,8 @@ name = "state" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/static_files/Cargo.toml b/examples/static_files/Cargo.toml index 4c3355eb..19be0c72 100644 --- a/examples/static_files/Cargo.toml +++ b/examples/static_files/Cargo.toml @@ -2,7 +2,8 @@ name = "static_files" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml index fdd32bde..40770325 100644 --- a/examples/stream/Cargo.toml +++ b/examples/stream/Cargo.toml @@ -2,7 +2,8 @@ name = "stream" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/tera_templates/Cargo.toml b/examples/tera_templates/Cargo.toml index 24ec2b3a..09da835d 100644 --- a/examples/tera_templates/Cargo.toml +++ b/examples/tera_templates/Cargo.toml @@ -2,15 +2,16 @@ name = "tera_templates" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } serde = "1.0" serde_derive = "1.0" serde_json = "1.0" [dependencies.rocket_contrib] -path = "../../contrib" +path = "../../contrib/lib" default-features = false features = ["tera_templates"] diff --git a/examples/testing/Cargo.toml b/examples/testing/Cargo.toml index 7a728c3d..4a481dc4 100644 --- a/examples/testing/Cargo.toml +++ b/examples/testing/Cargo.toml @@ -2,7 +2,8 @@ name = "testing" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/tls/Cargo.toml b/examples/tls/Cargo.toml index 7db8792d..1d71d703 100644 --- a/examples/tls/Cargo.toml +++ b/examples/tls/Cargo.toml @@ -2,7 +2,8 @@ name = "tls" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib", features = ["tls"] } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib", features = ["tls"] } +rocket_codegen = { path = "../../core/codegen" } diff --git a/examples/todo/Cargo.toml b/examples/todo/Cargo.toml index 8815abfb..687535aa 100644 --- a/examples/todo/Cargo.toml +++ b/examples/todo/Cargo.toml @@ -2,10 +2,11 @@ name = "todo" version = "0.0.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } serde = "1.0" serde_json = "1.0" serde_derive = "1.0" @@ -16,6 +17,6 @@ parking_lot = {version = "0.5", features = ["nightly"]} rand = "0.4" [dependencies.rocket_contrib] -path = "../../contrib" +path = "../../contrib/lib" default_features = false features = [ "tera_templates" ] diff --git a/examples/uuid/Cargo.toml b/examples/uuid/Cargo.toml index bb2619de..4abb3c7b 100644 --- a/examples/uuid/Cargo.toml +++ b/examples/uuid/Cargo.toml @@ -2,14 +2,15 @@ name = "uuid" version = "0.1.0" workspace = "../../" +publish = false [dependencies] -rocket = { path = "../../lib" } -rocket_codegen = { path = "../../codegen" } +rocket = { path = "../../core/lib" } +rocket_codegen = { path = "../../core/codegen" } uuid = ">= 0.5, <= 0.6" lazy_static = "1.0" [dependencies.rocket_contrib] default-features = false -path = "../../contrib" +path = "../../contrib/lib" features = ["uuid"] diff --git a/rustfmt.toml b/rustfmt.toml deleted file mode 100644 index 935ef839..00000000 --- a/rustfmt.toml +++ /dev/null @@ -1,14 +0,0 @@ -max_width = 90 -fn_call_width = 90 -condense_wildcard_suffixes = true -error_on_line_overflow = false -fn_args_density = "CompressedIfEmpty" -fn_call_style = "Visual" -chain_one_line_max = 80 -imports_layout = "Horizontal" -match_pattern_separator_break_point = "Front" -struct_lit_width = 40 -use_try_shorthand = true -where_style = "Legacy" -where_density = "Vertical" -where_layout = "HorizontalVertical" diff --git a/scripts/config.sh b/scripts/config.sh index 5f6d2731..9a4dd6ac 100755 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -25,9 +25,9 @@ function relative() { ROOT_DIR=$(relative "") || exit $? EXAMPLES_DIR=$(relative "examples") || exit $? -LIB_DIR=$(relative "lib") || exit $? -CODEGEN_DIR=$(relative "codegen") || exit $? -CONTRIB_DIR=$(relative "contrib") || exit $? +LIB_DIR=$(relative "core/lib") || exit $? +CODEGEN_DIR=$(relative "core/codegen") || exit $? +CONTRIB_DIR=$(relative "contrib/lib") || exit $? DOC_DIR=$(relative "target/doc") || exit $? if [ "${1}" = "-p" ]; then