Skip to content

Commit ba4d8a2

Browse files
authored
Move axum crate into workspace subfolder (#458)
* Move axum crate into workspace subfolder Over time I imagine we're gonna have other crates in this repo that provide utilities or integrations for axum. This prepares for that by moving the main axum crate into its own folder. The README situation is a bit annoying because we want `./README.md` for viewing the repo on github but `axum/README.md` for crates.io. For now I've just copy/pasted it and added CI step to make sure they're identical. * update changelog link * Add licenses to all examples * is this how you install `diff`? * or maybe this is how? * fix readme links * like this? * fix cargo-deny step * Try making root readme a symlink * remove compare readme step not needed since readme in repo root is now a symlink * Revert "Add licenses to all examples" This reverts commit ab321b7.
1 parent b60bfd7 commit ba4d8a2

File tree

101 files changed

+778
-763
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+778
-763
lines changed

.github/workflows/CI.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,15 @@ jobs:
125125
deny-check:
126126
name: cargo-deny check
127127
runs-on: ubuntu-latest
128+
continue-on-error: ${{ matrix.checks == 'advisories' }}
129+
strategy:
130+
matrix:
131+
checks:
132+
- advisories
133+
- bans licenses sources
128134
steps:
129-
- uses: actions/checkout@v1
130-
- uses: EmbarkStudios/cargo-deny-action@v1
135+
- uses: actions/checkout@v2
136+
- uses: EmbarkStudios/cargo-deny-action@v1
137+
with:
138+
command: check ${{ matrix.checks }}
139+
arguments: --all-features --manifest-path axum/Cargo.toml

CHANGELOG.md

+1-480
Large diffs are not rendered by default.

Cargo.toml

+3-93
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,5 @@
1-
[package]
2-
name = "axum"
3-
version = "0.3.0"
4-
authors = ["David Pedersen <[email protected]>"]
5-
categories = ["asynchronous", "network-programming", "web-programming"]
6-
description = "Web framework that focuses on ergonomics and modularity"
7-
edition = "2018"
8-
homepage = "https://github.com/tokio-rs/axum"
9-
keywords = ["http", "web", "framework"]
10-
license = "MIT"
11-
readme = "README.md"
12-
repository = "https://github.com/tokio-rs/axum"
13-
141
[workspace]
15-
members = ["examples/*"]
16-
17-
[features]
18-
default = ["http1", "json", "tower-log"]
19-
http1 = ["hyper/http1"]
20-
http2 = ["hyper/http2"]
21-
json = ["serde_json", "mime"]
22-
multipart = ["multer", "mime"]
23-
tower-log = ["tower/log"]
24-
ws = ["tokio-tungstenite", "sha-1", "base64"]
25-
26-
[dependencies]
27-
async-trait = "0.1.43"
28-
bitflags = "1.0"
29-
bytes = "1.0"
30-
futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
31-
http = "0.2"
32-
http-body = "0.4.4"
33-
hyper = { version = "0.14.14", features = ["server", "tcp", "stream"] }
34-
matchit = "0.4.4"
35-
percent-encoding = "2.1"
36-
pin-project-lite = "0.2.7"
37-
serde = "1.0"
38-
serde_urlencoded = "0.7"
39-
sync_wrapper = "0.1.1"
40-
tokio = { version = "1", features = ["time"] }
41-
tokio-util = "0.6"
42-
tower = { version = "0.4.10", default-features = false, features = ["util", "buffer", "make"] }
43-
tower-http = { version = "0.1", features = ["add-extension", "map-response-body"] }
44-
tower-layer = "0.3"
45-
tower-service = "0.3"
46-
47-
# optional dependencies
48-
base64 = { optional = true, version = "0.13" }
49-
headers = { optional = true, version = "0.3" }
50-
mime = { optional = true, version = "0.3" }
51-
multer = { optional = true, version = "2.0.0" }
52-
serde_json = { version = "1.0", optional = true }
53-
sha-1 = { optional = true, version = "0.9.6" }
54-
tokio-tungstenite = { optional = true, version = "0.15" }
55-
56-
[dev-dependencies]
57-
futures = "0.3"
58-
reqwest = { version = "0.11", features = ["json", "stream"] }
59-
serde = { version = "1.0", features = ["derive"] }
60-
serde_json = "1.0"
61-
tokio = { version = "1.6.1", features = ["macros", "rt", "rt-multi-thread", "net"] }
62-
tokio-stream = "0.1"
63-
tracing = "0.1"
64-
uuid = { version = "0.8", features = ["serde", "v4"] }
65-
anyhow = "1.0"
66-
67-
[dev-dependencies.tower]
68-
package = "tower"
69-
version = "0.4.10"
70-
features = [
71-
"util",
72-
"timeout",
73-
"limit",
74-
"load-shed",
75-
"steer",
76-
"filter",
77-
]
78-
79-
[dev-dependencies.tower-http]
80-
version = "0.1"
81-
features = ["full"]
82-
83-
[package.metadata.docs.rs]
84-
all-features = true
85-
rustdoc-args = ["--cfg", "docsrs"]
86-
87-
[package.metadata.playground]
88-
features = [
89-
"http1",
90-
"http2",
91-
"json",
92-
"multipart",
93-
"tower",
94-
"ws",
2+
members = [
3+
"axum",
4+
"examples/*",
955
]

README.md

-157
This file was deleted.

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
axum/README.md

0 commit comments

Comments
 (0)