Skip to content

Commit 8ba713c

Browse files
authored
Merge pull request #339 from http-rs/prep-release
Prepare 0.3.0 release
2 parents 528c2b1 + 0117539 commit 8ba713c

File tree

8 files changed

+85
-494
lines changed

8 files changed

+85
-494
lines changed

CHANGELOG.md

Lines changed: 58 additions & 439 deletions
Large diffs are not rendered by default.

Cargo.toml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
[package]
2+
name = "tide"
3+
version = "0.3.0"
4+
description = "Serve the web – HTTP server framework"
25
authors = [
36
"Aaron Turon <[email protected]>",
47
"Yoshua Wuyts <[email protected]>",
58
]
6-
description = "WIP modular web framework"
79
documentation = "https://docs.rs/tide"
810
keywords = ["tide", "http", "web", "framework", "async"]
911
categories = [
@@ -13,10 +15,8 @@ categories = [
1315
]
1416
edition = "2018"
1517
license = "MIT OR Apache-2.0"
16-
name = "tide"
1718
readme = "README.md"
18-
repository = "https://github.com/rustasync/tide"
19-
version = "0.2.0"
19+
repository = "https://github.com/http-rs/tide"
2020

2121
[dependencies]
2222
cookie = { version = "0.12.0", features = ["percent-encode"] }
@@ -47,6 +47,7 @@ version = "0.16.1"
4747
[features]
4848
default = ["hyper"]
4949
hyper = ["http-service-hyper"]
50+
unstable = []
5051

5152
[dev-dependencies]
5253
basic-cookies = "0.1.3"
@@ -60,8 +61,3 @@ mime_guess = "2.0.1"
6061
percent-encoding = "2.1.0"
6162
serde = { version = "1.0.102", features = ["derive"] }
6263
structopt = "0.3.3"
63-
64-
[patch.crates-io]
65-
http-service = { git = "https://github.com/rustasync/http-service", branch = "master" }
66-
http-service-hyper = { git = "https://github.com/rustasync/http-service", branch = "master" }
67-
http-service-mock = { git = "https://github.com/rustasync/http-service", branch = "master" }

README.md

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align="center">Tide</h1>
22
<div align="center">
33
<strong>
4-
Empowering everyone to build HTTP Services.
4+
Serve the web
55
</strong>
66
</div>
77

@@ -13,11 +13,6 @@
1313
<img src="https://img.shields.io/crates/v/tide.svg?style=flat-square"
1414
alt="Crates.io version" />
1515
</a>
16-
<!-- Build Status -->
17-
<a href="https://travis-ci.org/rustasync/tide">
18-
<img src="https://img.shields.io/travis/rustasync/tide.svg?style=flat-square"
19-
alt="Build Status" />
20-
</a>
2116
<!-- Downloads -->
2217
<a href="https://crates.io/crates/tide">
2318
<img src="https://img.shields.io/crates/d/tide.svg?style=flat-square"
@@ -46,14 +41,8 @@
4641
</h3>
4742
</div>
4843

49-
<div align="center">
50-
<sub>Built with 🌊 by <a href="https://github.com/rustasync">The Rust Async Ecosystem WG</a>
51-
</div>
52-
53-
## About
54-
55-
A modular web framework built around async/await. It's actively being developed by the Rust Async
56-
Ecosystem WG, and **not ready for production use yet**.
44+
A modular web framework built around async/await. It's actively being developed
45+
and **not ready for production use yet**.
5746

5847
## Examples
5948

@@ -64,7 +53,7 @@ Ecosystem WG, and **not ready for production use yet**.
6453

6554
fn main() -> Result<(), std::io::Error> {
6655
let mut app = tide::App::new();
67-
app.at("/").get(async move |_| "Hello, world!");
56+
app.at("/").get(|_| async move { "Hello, world!" });
6857
Ok(app.serve("127.0.0.1:8000")?)
6958
}
7059
```
@@ -89,18 +78,6 @@ Read about the design here:
8978
- [Middleware in Tide](https://rustasync.github.io/team/2018/11/07/tide-middleware.html)
9079
- [Tide's evolving middleware approach](https://rustasync.github.io/team/2018/11/27/tide-middleware-evolution.html)
9180

92-
### Supported Rust Versions
93-
94-
Tide is built against the latest Rust nightly releases and as such, due to it's use of `std` futures,
95-
it has the following specific breakpoints that align with std future API changes:
96-
97-
| Tide | Rust |
98-
| ----------- | ----------------------- |
99-
| &le; v0.1.0 | &le; nightly-2019-04-07 |
100-
| &ge; v0.1.1 | &ge; nightly-2019-04-08 |
101-
102-
_**Note:** Since these are due to changes in `std`, projects with dependencies that use conflicting versions of `std::futures` will not build successfully._
103-
10481
## Contributing
10582

10683
Want to join us? Check out our [The "Contributing" section of the

examples/default_headers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fn main() {
99
.header("X-Server", "Tide"),
1010
);
1111

12-
app.at("/").get(|_| async move {"Hello, world!"});
12+
app.at("/").get(|_| async move { "Hello, world!" });
1313

1414
app.serve("127.0.0.1:8000").unwrap();
1515
}

examples/hello.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fn main() {
22
let mut app = tide::App::new();
3-
app.at("/").get(|_| async move {"Hello, world!" });
3+
app.at("/").get(|_| async move { "Hello, world!" });
44
app.serve("127.0.0.1:8000").unwrap();
55
}

examples/staticfile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl StaticFile {
6666
}
6767
};
6868

69-
let mime = mime_guess::guess_mime_type(path);
69+
let mime = mime_guess::from_path(path).first_or_octet_stream();
7070
let mime_str = mime.as_ref();
7171
let size = meta.len();
7272

src/app.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,9 @@ mod tests {
322322
#[test]
323323
fn simple_static() {
324324
let mut router = App::new();
325-
router.at("/").get(|_| async move {"/"});
326-
router.at("/foo").get(|_| async move {"/foo"});
327-
router.at("/foo/bar").get(|_| async move {"/foo/bar"});
325+
router.at("/").get(|_| async move { "/" });
326+
router.at("/foo").get(|_| async move { "/foo" });
327+
router.at("/foo/bar").get(|_| async move { "/foo/bar" });
328328

329329
for path in &["/", "/foo", "/foo/bar"] {
330330
let res = block_on(simulate_request(&router, path, http::Method::GET));
@@ -336,23 +336,23 @@ mod tests {
336336
#[test]
337337
fn nested_static() {
338338
let mut router = App::new();
339-
router.at("/a").get(|_| async move {"/a"});
339+
router.at("/a").get(|_| async move { "/a" });
340340
router.at("/b").nest(|router| {
341-
router.at("/").get(|_| async move {"/b"});
342-
router.at("/a").get(|_| async move {"/b/a"});
343-
router.at("/b").get(|_| async move {"/b/b"});
341+
router.at("/").get(|_| async move { "/b" });
342+
router.at("/a").get(|_| async move { "/b/a" });
343+
router.at("/b").get(|_| async move { "/b/b" });
344344
router.at("/c").nest(|router| {
345-
router.at("/a").get(|_| async move {"/b/c/a"});
346-
router.at("/b").get(|_| async move {"/b/c/b"});
345+
router.at("/a").get(|_| async move { "/b/c/a" });
346+
router.at("/b").get(|_| async move { "/b/c/b" });
347347
});
348-
router.at("/d").get(|_| async move {"/b/d"});
348+
router.at("/d").get(|_| async move { "/b/d" });
349349
});
350350
router.at("/a/a").nest(|router| {
351-
router.at("/a").get(|_| async move {"/a/a/a"});
352-
router.at("/b").get(|_| async move {"/a/a/b"});
351+
router.at("/a").get(|_| async move { "/a/a/a" });
352+
router.at("/b").get(|_| async move { "/a/a/b" });
353353
});
354354
router.at("/a/b").nest(|router| {
355-
router.at("/").get(|_| async move {"/a/b"});
355+
router.at("/").get(|_| async move { "/a/b" });
356356
});
357357

358358
for failing_path in &["/", "/a/a", "/a/b/a"] {
@@ -378,9 +378,9 @@ mod tests {
378378
fn multiple_methods() {
379379
let mut router = App::new();
380380
router.at("/a").nest(|router| {
381-
router.at("/b").get(|_| async move {"/a/b GET"});
381+
router.at("/b").get(|_| async move { "/a/b GET" });
382382
});
383-
router.at("/a/b").post(|_| async move {"/a/b POST"});
383+
router.at("/a/b").post(|_| async move { "/a/b POST" });
384384

385385
for (path, method) in &[("/a/b", http::Method::GET), ("/a/b", http::Method::POST)] {
386386
let res = block_on(simulate_request(&router, path, method.clone()));

src/middleware/cookies.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,5 +172,4 @@ mod tests {
172172

173173
assert!(iter.next().is_none());
174174
}
175-
176175
}

0 commit comments

Comments
 (0)