From 44ac3f1eb6daf7000b5fc0e5f2ad9976380d7187 Mon Sep 17 00:00:00 2001 From: Sergio Benitez Date: Sat, 18 Nov 2023 11:30:50 +0100 Subject: [PATCH] Move to 0.6.0-dev on master. --- contrib/db_pools/README.md | 12 ++++++------ contrib/db_pools/lib/Cargo.toml | 2 +- contrib/db_pools/lib/src/diesel.rs | 2 +- contrib/dyn_templates/Cargo.toml | 4 ++-- contrib/dyn_templates/README.md | 2 +- contrib/dyn_templates/src/lib.rs | 4 ++-- contrib/sync_db_pools/README.md | 2 +- contrib/sync_db_pools/lib/Cargo.toml | 4 ++-- contrib/sync_db_pools/lib/src/lib.rs | 4 ++-- contrib/ws/Cargo.toml | 4 ++-- contrib/ws/README.md | 2 +- contrib/ws/src/lib.rs | 2 +- core/codegen/Cargo.toml | 6 +++--- core/codegen/src/lib.rs | 6 +++--- core/http/Cargo.toml | 4 ++-- core/lib/Cargo.toml | 8 ++++---- core/lib/src/config/config.rs | 2 +- core/lib/src/config/mod.rs | 2 +- core/lib/src/config/secret_key.rs | 4 ++-- core/lib/src/fairing/ad_hoc.rs | 2 +- core/lib/src/fairing/mod.rs | 2 +- core/lib/src/form/context.rs | 2 +- core/lib/src/form/form.rs | 2 +- core/lib/src/form/from_form.rs | 2 +- core/lib/src/form/mod.rs | 2 +- core/lib/src/lib.rs | 26 +++++++++++++------------- core/lib/src/local/client.rs | 2 +- core/lib/src/local/mod.rs | 2 +- core/lib/src/mtls.rs | 2 +- core/lib/src/request/from_request.rs | 2 +- core/lib/src/serde/json.rs | 2 +- core/lib/src/serde/msgpack.rs | 2 +- core/lib/src/serde/uuid.rs | 2 +- core/lib/src/shield/mod.rs | 2 +- scripts/config.sh | 2 +- site/README.md | 2 +- site/guide/1-quickstart.md | 2 +- site/guide/10-pastebin-tutorial.md | 2 +- site/guide/12-faq.md | 2 +- site/guide/2-getting-started.md | 2 +- site/guide/3-overview.md | 4 ++-- site/guide/4-requests.md | 4 ++-- site/guide/9-configuration.md | 4 ++-- site/guide/index.md | 2 +- site/tests/Cargo.toml | 2 +- 45 files changed, 79 insertions(+), 79 deletions(-) diff --git a/contrib/db_pools/README.md b/contrib/db_pools/README.md index 6ccaa1ff..c06b03b9 100644 --- a/contrib/db_pools/README.md +++ b/contrib/db_pools/README.md @@ -3,7 +3,7 @@ [crates.io]: https://img.shields.io/crates/v/rocket_db_pools.svg [crate]: https://crates.io/crates/rocket_db_pools [docs.svg]: https://img.shields.io/badge/web-master-red.svg?style=flat&label=docs&colorB=d33847 -[crate docs]: https://api.rocket.rs/v0.5/rocket_db_pools +[crate docs]: https://api.rocket.rs/master/rocket_db_pools [ci.svg]: https://github.com/SergioBenitez/Rocket/workflows/CI/badge.svg [ci]: https://github.com/SergioBenitez/Rocket/actions @@ -60,8 +60,8 @@ full usage details. } ``` -[database driver features]: https://api.rocket.rs/v0.5/rocket_db_pools/index.html#supported-drivers -[`Pool`]: https://api.rocket.rs/v0.5/rocket_db_pools/index.html#supported-drivers -[Configure]: https://api.rocket.rs/v0.5/rocket_db_pools/index.html#configuration -[Derive `Database`]: https://api.rocket.rs/v0.5/rocket_db_pools/derive.Database.html -[`Connection`]: https://api.rocket.rs/v0.5/rocket_db_pools/struct.Connection.html +[database driver features]: https://api.rocket.rs/master/rocket_db_pools/index.html#supported-drivers +[`Pool`]: https://api.rocket.rs/master/rocket_db_pools/index.html#supported-drivers +[Configure]: https://api.rocket.rs/master/rocket_db_pools/index.html#configuration +[Derive `Database`]: https://api.rocket.rs/master/rocket_db_pools/derive.Database.html +[`Connection`]: https://api.rocket.rs/master/rocket_db_pools/struct.Connection.html diff --git a/contrib/db_pools/lib/Cargo.toml b/contrib/db_pools/lib/Cargo.toml index 0d7284cf..e837bf7f 100644 --- a/contrib/db_pools/lib/Cargo.toml +++ b/contrib/db_pools/lib/Cargo.toml @@ -29,7 +29,7 @@ diesel_mysql = ["diesel-async/mysql", "diesel-async/deadpool", "diesel", "deadpo [dependencies.rocket] path = "../../../core/lib" -version = "0.5.0" +version = "0.6.0-dev" default-features = false [dependencies.rocket_db_pools_codegen] diff --git a/contrib/db_pools/lib/src/diesel.rs b/contrib/db_pools/lib/src/diesel.rs index 911ba776..c7229eab 100644 --- a/contrib/db_pools/lib/src/diesel.rs +++ b/contrib/db_pools/lib/src/diesel.rs @@ -8,7 +8,7 @@ //! //! ```toml //! [dependencies] -//! rocket = "0.5.0" +//! rocket = "0.6.0-dev" //! diesel = "2" //! //! [dependencies.rocket_db_pools] diff --git a/contrib/dyn_templates/Cargo.toml b/contrib/dyn_templates/Cargo.toml index 92e61f8d..f6cca212 100644 --- a/contrib/dyn_templates/Cargo.toml +++ b/contrib/dyn_templates/Cargo.toml @@ -3,7 +3,7 @@ name = "rocket_dyn_templates" version = "0.1.0" authors = ["Sergio Benitez "] description = "Dynamic templating engine integration for Rocket." -documentation = "https://api.rocket.rs/v0.5/rocket_dyn_templates/" +documentation = "https://api.rocket.rs/master/rocket_dyn_templates/" homepage = "https://rocket.rs" repository = "https://github.com/SergioBenitez/Rocket/tree/master/contrib/dyn_templates" readme = "README.md" @@ -22,7 +22,7 @@ notify = "6" normpath = "1" [dependencies.rocket] -version = "0.5.0" +version = "0.6.0-dev" path = "../../core/lib" default-features = false diff --git a/contrib/dyn_templates/README.md b/contrib/dyn_templates/README.md index fad858ce..34a521e2 100644 --- a/contrib/dyn_templates/README.md +++ b/contrib/dyn_templates/README.md @@ -3,7 +3,7 @@ [crates.io]: https://img.shields.io/crates/v/rocket_dyn_templates.svg [crate]: https://crates.io/crates/rocket_dyn_templates [docs.svg]: https://img.shields.io/badge/web-master-red.svg?style=flat&label=docs&colorB=d33847 -[crate docs]: https://api.rocket.rs/v0.5/rocket_dyn_templates +[crate docs]: https://api.rocket.rs/master/rocket_dyn_templates [ci.svg]: https://github.com/SergioBenitez/Rocket/workflows/CI/badge.svg [ci]: https://github.com/SergioBenitez/Rocket/actions diff --git a/contrib/dyn_templates/src/lib.rs b/contrib/dyn_templates/src/lib.rs index 2dfb474d..488f802d 100644 --- a/contrib/dyn_templates/src/lib.rs +++ b/contrib/dyn_templates/src/lib.rs @@ -66,7 +66,7 @@ //! template directory is configured via the `template_dir` configuration //! parameter and defaults to `templates/`. The path set in `template_dir` is //! relative to the Rocket configuration file. See the [configuration -//! chapter](https://rocket.rs/v0.5/guide/configuration) of the guide for more +//! chapter](https://rocket.rs/master/guide/configuration) of the guide for more //! information on configuration. //! //! The corresponding templating engine used for a given template is based on a @@ -132,7 +132,7 @@ //! the templates directory since the previous request. In release builds, //! template reloading is disabled to improve performance and cannot be enabled. -#![doc(html_root_url = "https://api.rocket.rs/v0.5/rocket_dyn_templates")] +#![doc(html_root_url = "https://api.rocket.rs/master/rocket_dyn_templates")] #![doc(html_favicon_url = "https://rocket.rs/images/favicon.ico")] #![doc(html_logo_url = "https://rocket.rs/images/logo-boxed.png")] diff --git a/contrib/sync_db_pools/README.md b/contrib/sync_db_pools/README.md index 04edf74d..1a630190 100644 --- a/contrib/sync_db_pools/README.md +++ b/contrib/sync_db_pools/README.md @@ -3,7 +3,7 @@ [crates.io]: https://img.shields.io/crates/v/rocket_sync_db_pools.svg [crate]: https://crates.io/crates/rocket_sync_db_pools [docs.svg]: https://img.shields.io/badge/web-master-red.svg?style=flat&label=docs&colorB=d33847 -[crate docs]: https://api.rocket.rs/v0.5/rocket_sync_db_pools +[crate docs]: https://api.rocket.rs/master/rocket_sync_db_pools [ci.svg]: https://github.com/SergioBenitez/Rocket/workflows/CI/badge.svg [ci]: https://github.com/SergioBenitez/Rocket/actions diff --git a/contrib/sync_db_pools/lib/Cargo.toml b/contrib/sync_db_pools/lib/Cargo.toml index 32854eab..fd5fdd75 100644 --- a/contrib/sync_db_pools/lib/Cargo.toml +++ b/contrib/sync_db_pools/lib/Cargo.toml @@ -3,7 +3,7 @@ name = "rocket_sync_db_pools" version = "0.1.0" authors = ["Sergio Benitez "] description = "Rocket async database pooling support for sync database drivers." -repository = "https://github.com/SergioBenitez/Rocket/tree/v0.5/contrib/sync_db_pools" +repository = "https://github.com/SergioBenitez/Rocket/tree/master/contrib/sync_db_pools" readme = "../README.md" keywords = ["rocket", "framework", "database", "pools"] license = "MIT OR Apache-2.0" @@ -39,7 +39,7 @@ version = "0.1.0" path = "../codegen" [dependencies.rocket] -version = "0.5.0" +version = "0.6.0-dev" path = "../../../core/lib" default-features = false diff --git a/contrib/sync_db_pools/lib/src/lib.rs b/contrib/sync_db_pools/lib/src/lib.rs index 1d83073c..6fafac0c 100644 --- a/contrib/sync_db_pools/lib/src/lib.rs +++ b/contrib/sync_db_pools/lib/src/lib.rs @@ -166,7 +166,7 @@ //! Lastly, databases can be configured via environment variables by specifying //! the `databases` table as detailed in the [Environment Variables //! configuration -//! guide](https://rocket.rs/v0.5/guide/configuration/#environment-variables): +//! guide](https://rocket.rs/master/guide/configuration/#environment-variables): //! //! ```bash //! ROCKET_DATABASES='{my_db={url="db.sqlite"}}' @@ -349,7 +349,7 @@ //! [request guards]: rocket::request::FromRequest //! [`Poolable`]: crate::Poolable -#![doc(html_root_url = "https://api.rocket.rs/v0.5/rocket_sync_db_pools")] +#![doc(html_root_url = "https://api.rocket.rs/master/rocket_sync_db_pools")] #![doc(html_favicon_url = "https://rocket.rs/images/favicon.ico")] #![doc(html_logo_url = "https://rocket.rs/images/logo-boxed.png")] #![cfg_attr(nightly, feature(doc_cfg))] diff --git a/contrib/ws/Cargo.toml b/contrib/ws/Cargo.toml index 573427df..a6c5750c 100644 --- a/contrib/ws/Cargo.toml +++ b/contrib/ws/Cargo.toml @@ -3,7 +3,7 @@ name = "rocket_ws" version = "0.1.0" authors = ["Sergio Benitez "] description = "WebSocket support for Rocket." -documentation = "https://api.rocket.rs/v0.5/rocket_ws/" +documentation = "https://api.rocket.rs/master/rocket_ws/" homepage = "https://rocket.rs" repository = "https://github.com/SergioBenitez/Rocket/tree/master/contrib/ws" readme = "README.md" @@ -20,7 +20,7 @@ tungstenite = ["tokio-tungstenite"] tokio-tungstenite = { version = "0.20", optional = true } [dependencies.rocket] -version = "0.5.0" +version = "0.6.0-dev" path = "../../core/lib" default-features = false diff --git a/contrib/ws/README.md b/contrib/ws/README.md index 27da59a4..e019659a 100644 --- a/contrib/ws/README.md +++ b/contrib/ws/README.md @@ -3,7 +3,7 @@ [crates.io]: https://img.shields.io/crates/v/rocket_ws.svg [crate]: https://crates.io/crates/rocket_ws [docs.svg]: https://img.shields.io/badge/web-master-red.svg?style=flat&label=docs&colorB=d33847 -[crate docs]: https://api.rocket.rs/v0.5/rocket_ws +[crate docs]: https://api.rocket.rs/master/rocket_ws [ci.svg]: https://github.com/SergioBenitez/Rocket/workflows/CI/badge.svg [ci]: https://github.com/SergioBenitez/Rocket/actions diff --git a/contrib/ws/src/lib.rs b/contrib/ws/src/lib.rs index 4768a043..e3d63ef0 100644 --- a/contrib/ws/src/lib.rs +++ b/contrib/ws/src/lib.rs @@ -70,7 +70,7 @@ //! } //! ``` -#![doc(html_root_url = "https://api.rocket.rs/v0.5/rocket_ws")] +#![doc(html_root_url = "https://api.rocket.rs/master/rocket_ws")] #![doc(html_favicon_url = "https://rocket.rs/images/favicon.ico")] #![doc(html_logo_url = "https://rocket.rs/images/logo-boxed.png")] diff --git a/core/codegen/Cargo.toml b/core/codegen/Cargo.toml index d11974c1..7cf65156 100644 --- a/core/codegen/Cargo.toml +++ b/core/codegen/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "rocket_codegen" -version = "0.5.0" +version = "0.6.0-dev" authors = ["Sergio Benitez "] description = "Procedural macros for the Rocket web framework." -documentation = "https://api.rocket.rs/v0.5/rocket_codegen/" +documentation = "https://api.rocket.rs/master/rocket_codegen/" homepage = "https://rocket.rs" repository = "https://github.com/SergioBenitez/Rocket" readme = "../../README.md" @@ -21,7 +21,7 @@ quote = "1.0" syn = { version = "2.0", features = ["full", "visit", "visit-mut", "extra-traits"] } proc-macro2 = "1.0.27" devise = "0.4" -rocket_http = { version = "0.5.0", path = "../http/" } +rocket_http = { version = "0.6.0-dev", path = "../http/" } unicode-xid = "0.2" version_check = "0.9" glob = "0.3" diff --git a/core/codegen/src/lib.rs b/core/codegen/src/lib.rs index 1d22fe43..c375351f 100644 --- a/core/codegen/src/lib.rs +++ b/core/codegen/src/lib.rs @@ -1,6 +1,6 @@ #![recursion_limit="128"] -#![doc(html_root_url = "https://api.rocket.rs/v0.5")] +#![doc(html_root_url = "https://api.rocket.rs/master")] #![doc(html_favicon_url = "https://rocket.rs/images/favicon.ico")] #![doc(html_logo_url = "https://rocket.rs/images/logo-boxed.png")] @@ -11,7 +11,7 @@ //! This crate implements the code generation portions of Rocket. This includes //! custom derives, custom attributes, and procedural macros. The documentation //! here is purely technical. The code generation facilities are documented -//! thoroughly in the [Rocket programming guide](https://rocket.rs/v0.5/guide). +//! thoroughly in the [Rocket programming guide](https://rocket.rs/master/guide). //! //! # Usage //! @@ -21,7 +21,7 @@ //! //! ```toml //! [dependencies] -//! rocket = "0.5.0" +//! rocket = "0.6.0-dev" //! ``` //! //! And to import all macros, attributes, and derives via `#[macro_use]` in the diff --git a/core/http/Cargo.toml b/core/http/Cargo.toml index a5664ce4..10e5d225 100644 --- a/core/http/Cargo.toml +++ b/core/http/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "rocket_http" -version = "0.5.0" +version = "0.6.0-dev" authors = ["Sergio Benitez "] description = """ Types, traits, and parsers for HTTP requests, responses, and headers. """ -documentation = "https://api.rocket.rs/v0.5/rocket_http/" +documentation = "https://api.rocket.rs/master/rocket_http/" homepage = "https://rocket.rs" repository = "https://github.com/SergioBenitez/Rocket" readme = "../../README.md" diff --git a/core/lib/Cargo.toml b/core/lib/Cargo.toml index 2203ee1a..8a49cc60 100644 --- a/core/lib/Cargo.toml +++ b/core/lib/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "rocket" -version = "0.5.0" +version = "0.6.0-dev" authors = ["Sergio Benitez "] description = """ Web framework with a focus on usability, security, extensibility, and speed. """ -documentation = "https://api.rocket.rs/v0.5/rocket/" +documentation = "https://api.rocket.rs/master/rocket/" homepage = "https://rocket.rs" repository = "https://github.com/SergioBenitez/Rocket" readme = "../../README.md" @@ -61,11 +61,11 @@ tokio-stream = { version = "0.1.6", features = ["signal", "time"] } state = "0.6" [dependencies.rocket_codegen] -version = "0.5.0" +version = "0.6.0-dev" path = "../codegen" [dependencies.rocket_http] -version = "0.5.0" +version = "0.6.0-dev" path = "../http" features = ["serde"] diff --git a/core/lib/src/config/config.rs b/core/lib/src/config/config.rs index 3856e228..635f2801 100644 --- a/core/lib/src/config/config.rs +++ b/core/lib/src/config/config.rs @@ -23,7 +23,7 @@ use crate::config::SecretKey; /// See the [module level docs](crate::config) as well as the [configuration /// guide] for further details. /// -/// [configuration guide]: https://rocket.rs/v0.5/guide/configuration/ +/// [configuration guide]: https://rocket.rs/master/guide/configuration/ /// /// # Defaults /// diff --git a/core/lib/src/config/mod.rs b/core/lib/src/config/mod.rs index 6bd2de3f..7ea4c653 100644 --- a/core/lib/src/config/mod.rs +++ b/core/lib/src/config/mod.rs @@ -2,7 +2,7 @@ //! //! See the [configuration guide] for full details. //! -//! [configuration guide]: https://rocket.rs/v0.5/guide/configuration/ +//! [configuration guide]: https://rocket.rs/master/guide/configuration/ //! //! ## Extracting Configuration Parameters //! diff --git a/core/lib/src/config/secret_key.rs b/core/lib/src/config/secret_key.rs index 8302c7f4..07d804a3 100644 --- a/core/lib/src/config/secret_key.rs +++ b/core/lib/src/config/secret_key.rs @@ -71,8 +71,8 @@ enum Kind { /// assert!(matches!(error.kind(), ErrorKind::InsecureSecretKey(profile))); /// ``` /// -/// [private cookies]: https://rocket.rs/v0.5/guide/requests/#private-cookies -/// [configuration guide]: https://rocket.rs/v0.5/guide/configuration/#secret-key +/// [private cookies]: https://rocket.rs/master/guide/requests/#private-cookies +/// [configuration guide]: https://rocket.rs/master/guide/configuration/#secret-key #[derive(Clone)] #[cfg_attr(nightly, doc(cfg(feature = "secrets")))] pub struct SecretKey { diff --git a/core/lib/src/fairing/ad_hoc.rs b/core/lib/src/fairing/ad_hoc.rs index b428d307..e689cdfa 100644 --- a/core/lib/src/fairing/ad_hoc.rs +++ b/core/lib/src/fairing/ad_hoc.rs @@ -310,7 +310,7 @@ impl AdHoc { /// let response = client.get("/bar").dispatch(); /// assert_eq!(response.into_string().unwrap(), "bar"); /// ``` - // #[deprecated(since = "0.6", note = "routing from Rocket v0.5 is now standard")] + // #[deprecated(since = "0.7", note = "routing from Rocket 0.6 is now standard")] pub fn uri_normalizer() -> impl Fairing { #[derive(Default)] struct Normalizer { diff --git a/core/lib/src/fairing/mod.rs b/core/lib/src/fairing/mod.rs index be179595..fec2b33f 100644 --- a/core/lib/src/fairing/mod.rs +++ b/core/lib/src/fairing/mod.rs @@ -423,7 +423,7 @@ pub type Result, E = Rocket> = std::result::Result { /// The value, if it was successfully parsed, or `None` otherwise. diff --git a/core/lib/src/form/form.rs b/core/lib/src/form/form.rs index cd80db44..848d490d 100644 --- a/core/lib/src/form/form.rs +++ b/core/lib/src/form/form.rs @@ -12,7 +12,7 @@ use crate::form::prelude::*; /// This type implements the [`FromData`] trait. It provides a generic means to /// parse arbitrary structures from incoming form data. /// -/// See the [forms guide](https://rocket.rs/v0.5/guide/requests#forms) for +/// See the [forms guide](https://rocket.rs/master/guide/requests#forms) for /// general form support documentation. /// /// # Leniency diff --git a/core/lib/src/form/from_form.rs b/core/lib/src/form/from_form.rs index 0f04803d..4733469a 100644 --- a/core/lib/src/form/from_form.rs +++ b/core/lib/src/form/from_form.rs @@ -65,7 +65,7 @@ use crate::http::uncased::AsUncased; /// [FromFormField]: crate::form::FromFormField /// [`shift()`ed]: NameView::shift() /// [`key()`]: NameView::key() -/// [forms guide]: https://rocket.rs/v0.5/guide/requests/#forms +/// [forms guide]: https://rocket.rs/master/guide/requests/#forms /// /// # Parsing Strategy /// diff --git a/core/lib/src/form/mod.rs b/core/lib/src/form/mod.rs index 1d1c21b7..aa772a39 100644 --- a/core/lib/src/form/mod.rs +++ b/core/lib/src/form/mod.rs @@ -1,6 +1,6 @@ //! Parsing and validation of HTTP forms and fields. //! -//! See the [forms guide](https://rocket.rs/v0.5/guide/requests#forms) for +//! See the [forms guide](https://rocket.rs/master/guide/requests#forms) for //! general form support documentation. //! //! # Field Wire Format diff --git a/core/lib/src/lib.rs b/core/lib/src/lib.rs index 33874a7f..232a9814 100644 --- a/core/lib/src/lib.rs +++ b/core/lib/src/lib.rs @@ -1,6 +1,6 @@ #![recursion_limit="256"] -#![doc(html_root_url = "https://api.rocket.rs/v0.5")] +#![doc(html_root_url = "https://api.rocket.rs/master")] #![doc(html_favicon_url = "https://rocket.rs/images/favicon.ico")] #![doc(html_logo_url = "https://rocket.rs/images/logo-boxed.png")] #![cfg_attr(nightly, feature(doc_cfg))] @@ -18,10 +18,10 @@ //! detailed guide]. If you'd like pointers on getting started, see the //! [quickstart] or [getting started] chapters of the guide. //! -//! [overview]: https://rocket.rs/v0.5/overview -//! [full, detailed guide]: https://rocket.rs/v0.5/guide -//! [quickstart]: https://rocket.rs/v0.5/guide/quickstart -//! [getting started]: https://rocket.rs/v0.5/guide/getting-started +//! [overview]: https://rocket.rs/master/overview +//! [full, detailed guide]: https://rocket.rs/master/guide +//! [quickstart]: https://rocket.rs/master/guide/quickstart +//! [getting started]: https://rocket.rs/master/guide/getting-started //! //! ## Usage //! @@ -29,13 +29,13 @@ //! //! ```toml //! [dependencies] -//! rocket = "0.5.0" +//! rocket = "0.6.0-dev" //! ``` //! //! Note that development versions, tagged with `-dev`, are not published //! and need to be specified as [git dependencies]. //! -//! See the [guide](https://rocket.rs/v0.5/guide) for more information on how +//! See the [guide](https://rocket.rs/master/guide) for more information on how //! to write Rocket applications. Here's a simple example to get you started: //! //! [git dependencies]: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#specifying-dependencies-from-git-repositories @@ -73,21 +73,21 @@ //! //! ```toml //! [dependencies] -//! rocket = { version = "0.5.0", features = ["secrets", "tls", "json"] } +//! rocket = { version = "0.6.0-dev", features = ["secrets", "tls", "json"] } //! ``` //! //! Conversely, HTTP/2 can be disabled: //! //! ```toml //! [dependencies] -//! rocket = { version = "0.5.0", default-features = false } +//! rocket = { version = "0.6.0-dev", default-features = false } //! ``` //! //! [JSON (de)serialization]: crate::serde::json //! [MessagePack (de)serialization]: crate::serde::msgpack //! [UUID value parsing and (de)serialization]: crate::serde::uuid -//! [private cookies]: https://rocket.rs/v0.5/guide/requests/#private-cookies -//! [TLS]: https://rocket.rs/v0.5/guide/configuration/#tls +//! [private cookies]: https://rocket.rs/master/guide/requests/#private-cookies +//! [TLS]: https://rocket.rs/master/guide/configuration/#tls //! [mutual TLS]: crate::mtls //! //! ## Configuration @@ -103,8 +103,8 @@ //! integration testing of a Rocket application. The top-level [`local`] module //! documentation and the [testing guide] include detailed examples. //! -//! [configuration guide]: https://rocket.rs/v0.5/guide/configuration/ -//! [testing guide]: https://rocket.rs/v0.5/guide/testing/#testing +//! [configuration guide]: https://rocket.rs/master/guide/configuration/ +//! [testing guide]: https://rocket.rs/master/guide/testing/#testing //! [Figment]: https://docs.rs/figment /// These are public dependencies! Update docs if these are changed, especially diff --git a/core/lib/src/local/client.rs b/core/lib/src/local/client.rs index 5c2f92ee..48001f05 100644 --- a/core/lib/src/local/client.rs +++ b/core/lib/src/local/client.rs @@ -137,7 +137,7 @@ macro_rules! pub_client_impl { /// Deprecated alias to [`Client::tracked()`]. #[deprecated( - since = "0.5.0", + since = "0.6.0-dev", note = "choose between `Client::untracked()` and `Client::tracked()`" )] pub $($prefix)? fn new(rocket: Rocket

) -> Result { diff --git a/core/lib/src/local/mod.rs b/core/lib/src/local/mod.rs index 4a2bed5e..bed689a4 100644 --- a/core/lib/src/local/mod.rs +++ b/core/lib/src/local/mod.rs @@ -80,7 +80,7 @@ //! //! For more details on testing, see the [testing guide]. //! -//! [testing guide]: https://rocket.rs/v0.5/guide/testing/ +//! [testing guide]: https://rocket.rs/master/guide/testing/ //! [`Client`]: crate::local::asynchronous::Client //! //! # `Client` diff --git a/core/lib/src/mtls.rs b/core/lib/src/mtls.rs index 93e79945..441fffb6 100644 --- a/core/lib/src/mtls.rs +++ b/core/lib/src/mtls.rs @@ -2,7 +2,7 @@ //! //! For details on how to configure mutual TLS, see //! [`MutualTls`](crate::config::MutualTls) and the [TLS -//! guide](https://rocket.rs/v0.5/guide/configuration/#tls). See +//! guide](https://rocket.rs/master/guide/configuration/#tls). See //! [`Certificate`] for a request guard that validated, verifies, and retrieves //! client certificates. diff --git a/core/lib/src/request/from_request.rs b/core/lib/src/request/from_request.rs index 1dacb4d2..0d1879cc 100644 --- a/core/lib/src/request/from_request.rs +++ b/core/lib/src/request/from_request.rs @@ -368,7 +368,7 @@ pub type Outcome = outcome::Outcome; /// Notice that these request guards provide access to *borrowed* data (`&'a /// User` and `Admin<'a>`) as the data is now owned by the request's cache. /// -/// [request-local state]: https://rocket.rs/v0.5/guide/state/#request-local-state +/// [request-local state]: https://rocket.rs/master/guide/state/#request-local-state #[crate::async_trait] pub trait FromRequest<'r>: Sized { /// The associated error to be returned if derivation fails. diff --git a/core/lib/src/serde/json.rs b/core/lib/src/serde/json.rs index 677b20e7..c46db120 100644 --- a/core/lib/src/serde/json.rs +++ b/core/lib/src/serde/json.rs @@ -9,7 +9,7 @@ //! //! ```toml //! [dependencies.rocket] -//! version = "0.5.0" +//! version = "0.6.0-dev" //! features = ["json"] //! ``` //! diff --git a/core/lib/src/serde/msgpack.rs b/core/lib/src/serde/msgpack.rs index 7af49700..3360f998 100644 --- a/core/lib/src/serde/msgpack.rs +++ b/core/lib/src/serde/msgpack.rs @@ -9,7 +9,7 @@ //! //! ```toml //! [dependencies.rocket] -//! version = "0.5.0" +//! version = "0.6.0-dev" //! features = ["msgpack"] //! ``` //! diff --git a/core/lib/src/serde/uuid.rs b/core/lib/src/serde/uuid.rs index f834932a..48dbad24 100644 --- a/core/lib/src/serde/uuid.rs +++ b/core/lib/src/serde/uuid.rs @@ -7,7 +7,7 @@ //! //! ```toml //! [dependencies.rocket] -//! version = "0.5.0" +//! version = "0.6.0-dev" //! features = ["uuid"] //! ``` //! diff --git a/core/lib/src/shield/mod.rs b/core/lib/src/shield/mod.rs index b893c6c8..060f243b 100644 --- a/core/lib/src/shield/mod.rs +++ b/core/lib/src/shield/mod.rs @@ -4,7 +4,7 @@ //! security and privacy headers into all outgoing responses. It takes some //! inspiration from [helmetjs], a similar piece of middleware for [express]. //! -//! [fairing]: https://rocket.rs/v0.5/guide/fairings/ +//! [fairing]: https://rocket.rs/master/guide/fairings/ //! [helmetjs]: https://helmetjs.github.io/ //! [express]: https://expressjs.com //! diff --git a/scripts/config.sh b/scripts/config.sh index a9dc777a..42f4ec29 100755 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -58,7 +58,7 @@ VERSION=$(git grep -h "^version" "${CORE_LIB_ROOT}" | head -n 1 | cut -d '"' -f2 MAJOR_VERSION=$(echo "${VERSION}" | cut -d'.' -f1-2) VIRTUAL_CODENAME="$(git branch --show-current)" PHYSICAL_CODENAME="v${MAJOR_VERSION}" -CURRENT_RELEASE=true +CURRENT_RELEASE=false PRE_RELEASE=false # A generated codename for this version. Use the git branch for pre-releases. diff --git a/site/README.md b/site/README.md index d56b05ea..72bf7944 100644 --- a/site/README.md +++ b/site/README.md @@ -13,7 +13,7 @@ This directory contains the following: * `news/*.md` - News articles linked to from `news/index.toml`. * `guide/*.md` - Guide pages linked to from `guide.md`. -[Rocket Programming Guide]: https://rocket.rs/v0.5/guide/ +[Rocket Programming Guide]: https://rocket.rs/master/guide/ ### Guide Links diff --git a/site/guide/1-quickstart.md b/site/guide/1-quickstart.md index 51f3d5ef..c9254a6d 100644 --- a/site/guide/1-quickstart.md +++ b/site/guide/1-quickstart.md @@ -14,7 +14,7 @@ For instance, the following set of commands runs the `hello` example: ```sh git clone https://github.com/SergioBenitez/Rocket cd Rocket -git checkout v0.5 +git checkout master cd examples/hello cargo run ``` diff --git a/site/guide/10-pastebin-tutorial.md b/site/guide/10-pastebin-tutorial.md index ac44d064..90da9e5c 100644 --- a/site/guide/10-pastebin-tutorial.md +++ b/site/guide/10-pastebin-tutorial.md @@ -52,7 +52,7 @@ Then add the usual Rocket dependencies to the `Cargo.toml` file: ```toml [dependencies] -rocket = "0.5.0" +rocket = "0.6.0-dev" ``` And finally, create a skeleton Rocket application to work off of in diff --git a/site/guide/12-faq.md b/site/guide/12-faq.md index 9032c913..48cde1e3 100644 --- a/site/guide/12-faq.md +++ b/site/guide/12-faq.md @@ -644,7 +644,7 @@ is to depend on a `contrib` library from git while also depending on a `crates.io` version of Rocket or vice-versa: ```toml -rocket = "0.5.0" +rocket = "0.6.0-dev" rocket_db_pools = { git = "https://github.com/SergioBenitez/Rocket.git" } ``` diff --git a/site/guide/2-getting-started.md b/site/guide/2-getting-started.md index 0f485ca1..5232ecab 100644 --- a/site/guide/2-getting-started.md +++ b/site/guide/2-getting-started.md @@ -43,7 +43,7 @@ Now, add Rocket as a dependency in your `Cargo.toml`: ```toml [dependencies] -rocket = "0.5.0" +rocket = "0.6.0-dev" ``` ! warning: Development versions must be _git_ dependencies. diff --git a/site/guide/3-overview.md b/site/guide/3-overview.md index 499a7557..9ac19941 100644 --- a/site/guide/3-overview.md +++ b/site/guide/3-overview.md @@ -260,8 +260,8 @@ You can find async-ready libraries on [crates.io](https://crates.io) with the ! note - Rocket v0.5 uses the tokio runtime. The runtime is started for you if you - use `#[launch]` or `#[rocket::main]`, but you can still `launch()` a Rocket + Rocket uses the tokio runtime. The runtime is started for you if you use + `#[launch]` or `#[rocket::main]`, but you can still `launch()` a Rocket instance on a custom-built runtime by not using _either_ attribute. ### Async Routes diff --git a/site/guide/4-requests.md b/site/guide/4-requests.md index 8569ed72..b6247a92 100644 --- a/site/guide/4-requests.md +++ b/site/guide/4-requests.md @@ -606,7 +606,7 @@ feature: ```toml ## in Cargo.toml -rocket = { version = "0.5.0", features = ["secrets"] } +rocket = { version = "0.6.0-dev", features = ["secrets"] } ``` The API for retrieving, adding, and removing private cookies is identical except @@ -784,7 +784,7 @@ complete example. feature can be enabled in the `Cargo.toml`: ` - rocket = { version = "0.5.0", features = ["json"] } + rocket = { version = "0.6.0-dev", features = ["json"] } ` ### Temporary Files diff --git a/site/guide/9-configuration.md b/site/guide/9-configuration.md index b2f47c00..230d345b 100644 --- a/site/guide/9-configuration.md +++ b/site/guide/9-configuration.md @@ -237,7 +237,7 @@ Security). To enable TLS support: ```toml,ignore [dependencies] - rocket = { version = "0.5.0", features = ["tls"] } + rocket = { version = "0.6.0-dev", features = ["tls"] } ``` 2. Configure a TLS certificate chain and private key via the `tls.key` and @@ -302,7 +302,7 @@ enabled and support configured via the `tls.mutual` config parameter: ```toml,ignore [dependencies] - rocket = { version = "0.5.0", features = ["mtls"] } + rocket = { version = "0.6.0-dev", features = ["mtls"] } ``` This implicitly enables the `tls` feature. diff --git a/site/guide/index.md b/site/guide/index.md index 46dc9d62..fe9f0d64 100644 --- a/site/guide/index.md +++ b/site/guide/index.md @@ -2,7 +2,7 @@ Welcome to Rocket! -This is the official guide for Rocket v0.5. It is designed to serve as a +This is the official guide for Rocket master. It is designed to serve as a starting point to writing web applications with Rocket and Rust. The guide is also designed to be a reference for experienced Rocket developers. This guide is conversational in tone. For purely technical documentation with examples, see diff --git a/site/tests/Cargo.toml b/site/tests/Cargo.toml index 61d6ff50..7281464d 100644 --- a/site/tests/Cargo.toml +++ b/site/tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rocket_guide_tests" -version = "0.5.0" +version = "0.6.0-dev" workspace = "../../" edition = "2021" publish = false