Skip to content

Commit

Permalink
Move to 0.5.0-dev on master.
Browse files Browse the repository at this point in the history
  • Loading branch information
SergioBenitez committed May 13, 2019
1 parent 78525c1 commit 1caf87e
Show file tree
Hide file tree
Showing 34 changed files with 106 additions and 98 deletions.
55 changes: 30 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,23 @@ Rocket is extensively documented:
* [Guide]: A detailed guide and reference to Rocket.
* [API Documentation]: The "rustdocs".

[Quickstart]: https://rocket.rs/v0.4/guide/quickstart
[Getting Started]: https://rocket.rs/v0.4/guide/getting-started
[Overview]: https://rocket.rs/v0.4/overview
[Guide]: https://rocket.rs/v0.4/guide
[API Documentation]: https://api.rocket.rs/v0.4/rocket
[Quickstart]: https://rocket.rs/guide/quickstart
[Getting Started]: https://rocket.rs/guide/getting-started
[Overview]: https://rocket.rs/overview
[Guide]: https://rocket.rs/guide
[API Documentation]: https://api.rocket.rs/rocket

The official community support channels are the `#rocket` IRC channel on the
[Mozilla IRC Server](https://wiki.mozilla.org/IRC) at `irc.mozilla.org` and the
bridged [Rocket room on
Matrix](https://riot.im/app/#/room/#mozilla_#rocket:matrix.org). If you're not
familiar with IRC, we recommend chatting through [Matrix via
Riot](https://riot.im/app/#/room/#mozilla_#rocket:matrix.org) or via the [Kiwi
web IRC client](https://kiwiirc.com/client/irc.mozilla.org/#rocket). You can
learn more about IRC via Mozilla's [Getting Started with
IRC](https://developer.mozilla.org/en-US/docs/Mozilla/QA/Getting_Started_with_IRC)
guide.
[Mozilla IRC Server] at `irc.mozilla.org` and the bridged [Rocket room on
Matrix]. If you're not familiar with IRC, we recommend chatting through [Matrix
via Riot] or via the [Kiwi web IRC client]. You can learn more about IRC via
Mozilla's [Getting Started with IRC] guide.

[Mozilla IRC Server]: https://wiki.mozilla.org/IRC
[Rocket room on Matrix]: https://riot.im/app/#/room/#mozilla_#rocket:matrix.org
[Matrix via Riot]: https://riot.im/app/#/room/#mozilla_#rocket:matrix.org
[Kiwi web IRC client]: https://kiwiirc.com/client/irc.mozilla.org/#rocket
[Getting Started with IRC]: https://developer.mozilla.org/en-US/docs/Mozilla/QA/Getting_Started_with_IRC

## Building

Expand Down Expand Up @@ -101,28 +102,32 @@ example, the tests for routing can be found at the bottom of the

### Codegen

Code generation tests can be found in `codegen/tests`. We use the
[compiletest](https://crates.io/crates/compiletest_rs) library, which was
extracted from `rustc`, for testing. See the [compiler test
documentation](https://github.com/rust-lang/rust/blob/master/src/test/COMPILER_TESTS.md)
for information on how to write compiler tests.
Code generation tests can be found in `codegen/tests`. We use the [compiletest]
library, which was extracted from `rustc`, for testing. See the [compiler test
documentation] for information on how to write compiler tests.

[compiletest]: https://crates.io/crates/compiletest_rs
[compiler test documentation]: https://github.com/rust-lang/rust/blob/master/src/test/COMPILER_TESTS.md

## Documentation

You can build the Rocket API documentation locally by running
`./scripts/mk-docs.sh`. The resulting documentation is what gets uploaded to
[api.rocket.rs](https://api.rocket.rs/v0.4/).
[api.rocket.rs](https://api.rocket.rs/).

## Contributing

Contributions are absolutely, positively welcome and encouraged! Contributions
come in many forms. You could:

1. Submit a feature request or bug report as an [issue](https://github.com/SergioBenitez/Rocket/issues).
2. Ask for improved documentation as an [issue](https://github.com/SergioBenitez/Rocket/issues).
3. Comment on [issues that require
feedback](https://github.com/SergioBenitez/Rocket/issues?q=is%3Aissue+is%3Aopen+label%3A%22feedback+wanted%22).
4. Contribute code via [pull requests](https://github.com/SergioBenitez/Rocket/pulls).
1. Submit a feature request or bug report as an [issue].
2. Ask for improved documentation as an [issue].
3. Comment on [issues that require feedback].
4. Contribute code via [pull requests].

[issue]: https://github.com/SergioBenitez/Rocket/issues
[issues that require feedback]: https://github.com/SergioBenitez/Rocket/issues?q=is%3Aissue+is%3Aopen+label%3A%22feedback+wanted%22).
[pull requests]: https://github.com/SergioBenitez/Rocket/pulls.

We aim to keep Rocket's code quality at the highest level. This means that any
code you contribute must be:
Expand Down
8 changes: 4 additions & 4 deletions contrib/codegen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "rocket_contrib_codegen"
version = "0.4.0"
version = "0.5.0-dev"
authors = ["Sergio Benitez <[email protected]>"]
description = "Procedural macros for the Rocket contrib libraries."
documentation = "https://api.rocket.rs/v0.4/rocket_contrib/"
documentation = "https://api.rocket.rs/v0.5/rocket_contrib/"
homepage = "https://rocket.rs"
repository = "https://github.com/SergioBenitez/Rocket"
readme = "../../README.md"
Expand All @@ -27,5 +27,5 @@ version_check = "0.1.3"

[dev-dependencies]
compiletest_rs = { version = "0.3", features = ["stable"] }
rocket = { version = "0.4.0", path = "../../core/lib" }
rocket_contrib = { version = "0.4.0", path = "../lib", features = ["diesel_sqlite_pool"] }
rocket = { version = "0.5.0-dev", path = "../../core/lib" }
rocket_contrib = { version = "0.5.0-dev", path = "../lib", features = ["diesel_sqlite_pool"] }
2 changes: 1 addition & 1 deletion contrib/codegen/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fn main() {
print_version_err(&*version, &*date);
eprintln!("{}{}{}",
Blue.paint("See the getting started guide ("),
"https://rocket.rs/v0.4/guide/getting-started/",
"https://rocket.rs/v0.5/guide/getting-started/",
Blue.paint(") for more information."));
panic!("Aborting compilation due to incompatible compiler.")
}
Expand Down
8 changes: 4 additions & 4 deletions contrib/lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "rocket_contrib"
version = "0.4.0"
version = "0.5.0-dev"
authors = ["Sergio Benitez <[email protected]>"]
description = "Community contributed libraries for the Rocket web framework."
documentation = "https://api.rocket.rs/v0.4/rocket_contrib/"
documentation = "https://api.rocket.rs/v0.5/rocket_contrib/"
homepage = "https://rocket.rs"
repository = "https://github.com/SergioBenitez/Rocket"
readme = "../../README.md"
Expand Down Expand Up @@ -41,8 +41,8 @@ memcache_pool = ["databases", "memcache", "r2d2-memcache"]

[dependencies]
# Global dependencies.
rocket_contrib_codegen = { version = "0.4.0", path = "../codegen", optional = true }
rocket = { version = "0.4.0", path = "../../core/lib/", default-features = false }
rocket_contrib_codegen = { version = "0.5.0-dev", path = "../codegen", optional = true }
rocket = { version = "0.5.0-dev", path = "../../core/lib/", default-features = false }
log = "0.4"

# Serialization and templating dependencies.
Expand Down
2 changes: 1 addition & 1 deletion contrib/lib/src/compression/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//!
//! ```toml
//! [dependencies.rocket_contrib]
//! version = "0.4.0"
//! version = "0.5.0-dev"
//! default-features = false
//! features = ["compression"]
//! ```
Expand Down
4 changes: 2 additions & 2 deletions contrib/lib/src/databases.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
//!
//! ```toml
//! [dependencies.rocket_contrib]
//! version = "0.4.0"
//! version = "0.5.0-dev"
//! default-features = false
//! features = ["diesel_sqlite_pool"]
//! ```
Expand Down Expand Up @@ -174,7 +174,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.4/guide/configuration/#environment-variables):
//! guide](https://rocket.rs/v0.5/guide/configuration/#environment-variables):
//!
//! ```bash
//! ROCKET_DATABASES='{my_db={url="db.sqlite"}}'
Expand Down
4 changes: 2 additions & 2 deletions contrib/lib/src/helmet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//! takes some inspiration from [helmetjs], a similar piece of middleware for
//! [express].
//!
//! [fairing]: https://rocket.rs/v0.4/guide/fairings/
//! [fairing]: https://rocket.rs/v0.5/guide/fairings/
//! [helmetjs]: https://helmetjs.github.io/
//! [express]: https://expressjs.com
//! [`SpaceHelmet`]: helmet::SpaceHelmet
Expand All @@ -16,7 +16,7 @@
//!
//! ```toml
//! [dependencies.rocket_contrib]
//! version = "0.4.0"
//! version = "0.5.0-dev"
//! default-features = false
//! features = ["helmet"]
//! ```
Expand Down
2 changes: 1 addition & 1 deletion contrib/lib/src/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//!
//! ```toml
//! [dependencies.rocket_contrib]
//! version = "0.4.0"
//! version = "0.5.0-dev"
//! default-features = false
//! features = ["json"]
//! ```
Expand Down
8 changes: 4 additions & 4 deletions contrib/lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#![feature(never_type)]
#![feature(doc_cfg)]

#![doc(html_root_url = "https://api.rocket.rs/v0.4")]
#![doc(html_favicon_url = "https://rocket.rs/v0.4/images/favicon.ico")]
#![doc(html_logo_url = "https://rocket.rs/v0.4/images/logo-boxed.png")]
#![doc(html_root_url = "https://api.rocket.rs/v0.5")]
#![doc(html_favicon_url = "https://rocket.rs/v0.5/images/favicon.ico")]
#![doc(html_logo_url = "https://rocket.rs/v0.5/images/logo-boxed.png")]

//! This crate contains officially sanctioned contributor libraries that provide
//! functionality commonly used by Rocket applications.
Expand Down Expand Up @@ -34,7 +34,7 @@
//!
//! ```toml
//! [dependencies.rocket_contrib]
//! version = "0.4.0"
//! version = "0.5.0-dev"
//! default-features = false
//! features = ["json"]
//! ```
Expand Down
2 changes: 1 addition & 1 deletion contrib/lib/src/msgpack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//!
//! ```toml
//! [dependencies.rocket_contrib]
//! version = "0.4.0"
//! version = "0.5.0-dev"
//! default-features = false
//! features = ["msgpack"]
//! ```
Expand Down
2 changes: 1 addition & 1 deletion contrib/lib/src/serve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//!
//! ```toml
//! [dependencies.rocket_contrib]
//! version = "0.4.0"
//! version = "0.5.0-dev"
//! default-features = false
//! features = ["serve"]
//! ```
Expand Down
6 changes: 3 additions & 3 deletions contrib/lib/src/templates/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//!
//! ```toml
//! [dependencies.rocket_contrib]
//! version = "0.4.0"
//! version = "0.5.0-dev"
//! default-features = false
//! features = ["handlebars_templates", "tera_templates"]
//! ```
Expand Down Expand Up @@ -57,7 +57,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.4/guide/configuration/#extras) of the guide
//! chapter](https://rocket.rs/v0.5/guide/configuration/#extras) of the guide
//! for more information on configuration.
//!
//! The corresponding templating engine used for a given template is based on a
Expand Down Expand Up @@ -158,7 +158,7 @@ const DEFAULT_TEMPLATE_DIR: &str = "templates";
///
/// ```toml
/// [dependencies.rocket_contrib]
/// version = "0.4.0"
/// version = "0.5.0-dev"
/// default-features = false
/// features = ["handlebars_templates", "tera_templates"]
/// ```
Expand Down
4 changes: 2 additions & 2 deletions contrib/lib/src/uuid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//!
//! ```toml
//! [dependencies.rocket_contrib]
//! version = "0.4.0"
//! version = "0.5.0-dev"
//! default-features = false
//! features = ["uuid"]
//! ```
Expand All @@ -34,7 +34,7 @@ pub use self::uuid_crate::parser::ParseError;
///
/// ```toml
/// [dependencies.rocket_contrib]
/// version = "0.4.0"
/// version = "0.5.0-dev"
/// default-features = false
/// features = ["uuid"]
/// ```
Expand Down
8 changes: 4 additions & 4 deletions core/codegen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "rocket_codegen"
version = "0.4.0"
version = "0.5.0-dev"
authors = ["Sergio Benitez <[email protected]>"]
description = "Procedural macros for the Rocket web framework."
documentation = "https://api.rocket.rs/v0.4/rocket_codegen/"
documentation = "https://api.rocket.rs/v0.5/rocket_codegen/"
homepage = "https://rocket.rs"
repository = "https://github.com/SergioBenitez/Rocket"
readme = "../../README.md"
Expand All @@ -17,13 +17,13 @@ proc-macro = true
[dependencies]
indexmap = "1.0"
quote = "0.6.1"
rocket_http = { version = "0.4.0", path = "../http/" }
rocket_http = { version = "0.5.0-dev", path = "../http/" }
devise = "0.2"

[build-dependencies]
yansi = "0.5"
version_check = "0.1.3"

[dev-dependencies]
rocket = { version = "0.4.0", path = "../lib" }
rocket = { version = "0.5.0-dev", path = "../lib" }
compiletest_rs = { version = "0.3", features = ["stable"] }
2 changes: 1 addition & 1 deletion core/codegen/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fn main() {
print_version_err(&*version, &*date);
eprintln!("{}{}{}",
Blue.paint("See the getting started guide ("),
"https://rocket.rs/v0.4/guide/getting-started/",
"https://rocket.rs/v0.5/guide/getting-started/",
Blue.paint(") for more information."));
panic!("Aborting compilation due to incompatible compiler.")
}
Expand Down
10 changes: 5 additions & 5 deletions core/codegen/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
#![feature(crate_visibility_modifier)]
#![recursion_limit="128"]

#![doc(html_root_url = "https://api.rocket.rs/v0.4")]
#![doc(html_favicon_url = "https://rocket.rs/v0.4/images/favicon.ico")]
#![doc(html_logo_url = "https://rocket.rs/v0.4/images/logo-boxed.png")]
#![doc(html_root_url = "https://api.rocket.rs/v0.5")]
#![doc(html_favicon_url = "https://rocket.rs/v0.5/images/favicon.ico")]
#![doc(html_logo_url = "https://rocket.rs/v0.5/images/logo-boxed.png")]

//! # Rocket - Code Generation
//!
//! 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.4/guide).
//! thoroughly in the [Rocket programming guide](https://rocket.rs/v0.5/guide).
//!
//! # Usage
//!
Expand All @@ -21,7 +21,7 @@
//!
//! ```toml
//! [dependencies]
//! rocket = "0.4.0"
//! rocket = "0.5.0-dev"
//! ```
//!
//! And to import all macros, attributes, and derives via `#[macro_use]` in the
Expand Down
6 changes: 3 additions & 3 deletions core/http/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "rocket_http"
version = "0.4.0"
version = "0.5.0-dev"
authors = ["Sergio Benitez <[email protected]>"]
description = """
Types, traits, and parsers for HTTP requests, responses, and headers.
"""
documentation = "https://api.rocket.rs/v0.4/rocket_http/"
documentation = "https://api.rocket.rs/v0.5/rocket_http/"
homepage = "https://rocket.rs"
repository = "https://github.com/SergioBenitez/Rocket"
readme = "../../README.md"
Expand Down Expand Up @@ -36,4 +36,4 @@ features = ["server"]
optional = true

[dev-dependencies]
rocket = { version = "0.4.0", path = "../lib" }
rocket = { version = "0.5.0-dev", path = "../lib" }
8 changes: 4 additions & 4 deletions core/lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "rocket"
version = "0.4.0"
version = "0.5.0-dev"
authors = ["Sergio Benitez <[email protected]>"]
description = """
Web framework for nightly with a focus on ease-of-use, expressibility, and speed.
"""
documentation = "https://api.rocket.rs/v0.4/rocket/"
documentation = "https://api.rocket.rs/v0.5/rocket/"
homepage = "https://rocket.rs"
repository = "https://github.com/SergioBenitez/Rocket"
readme = "../../README.md"
Expand All @@ -23,8 +23,8 @@ tls = ["rocket_http/tls"]
private-cookies = ["rocket_http/private-cookies"]

[dependencies]
rocket_codegen = { version = "0.4.0", path = "../codegen" }
rocket_http = { version = "0.4.0", path = "../http" }
rocket_codegen = { version = "0.5.0-dev", path = "../codegen" }
rocket_http = { version = "0.5.0-dev", path = "../http" }
yansi = "0.5"
log = "0.4"
toml = "0.4.7"
Expand Down
2 changes: 1 addition & 1 deletion core/lib/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fn main() {
print_version_err(&*version, &*date);
eprintln!("{}{}{}",
Blue.paint("See the getting started guide ("),
"https://rocket.rs/v0.4/guide/getting-started/",
"https://rocket.rs/v0.5/guide/getting-started/",
Blue.paint(") for more information."));
panic!("Aborting compilation due to incompatible compiler.")
}
Expand Down
Loading

0 comments on commit 1caf87e

Please sign in to comment.