Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use 1.64 workspace dependencies #113

Closed
wants to merge 8 commits into from
Closed

use 1.64 workspace dependencies #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
839f1d0
use 1.64 workspace dependencies
justinmmott Sep 22, 2022
86b5945
use rust 1.64.0 by adding rust-toolchain.toml
justinmmott Sep 22, 2022
89d6614
add eof new line
justinmmott Sep 22, 2022
63079da
use typify in workspace dependencies as well
justinmmott Sep 23, 2022
9bd9605
forgot to use workspace here
justinmmott Sep 26, 2022
560b927
accidentally removed a space
justinmmott Sep 26, 2022
5a773cd
same as last one
justinmmott Sep 26, 2022
7e9579f
Merge branch 'main' into use-workspace-dependencies
ahl Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,19 @@ members = [
"example-build",
"example-macro",
]
default-members = [
"typify",
"typify-impl",
"typify-macro",
"typify-test",
]

[workspace.dependencies]
proc-macro2 = "1.0"
quote = "1.0"
regress = "0.4.1"
schemars = "0.8.10"
serde = "1.0"
serde_json = "1.0"
syn = "1.0"
typify = { path = "typify" }
8 changes: 4 additions & 4 deletions example-build/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Adam H. Leventhal <[email protected]>"]
edition = "2021"

[dependencies]
serde = "1.0"
serde = { workspace = true }

[build-dependencies]
schemars = "0.8"
serde_json = "1.0"
typify = { path = "../typify" }
schemars = { workspace = true }
serde_json = { workspace = true }
typify = { workspace = true }
6 changes: 3 additions & 3 deletions example-macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ authors = ["Adam H. Leventhal <[email protected]>"]
edition = "2021"

[dependencies]
typify = { path = "../typify" }
serde = "1.0"
serde_json = "1.0"
typify = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
8 changes: 8 additions & 0 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# We use a specific toolchain revision to ensure our tests - which
# occasionally depend on specific compiler output - remain stable
# for all developers until the toolchain is explicitly advanced.
# The intent is to keep this updated as new stable versions are relased.

[toolchain]
channel = "1.64.0"
profile = "default"
18 changes: 9 additions & 9 deletions typify-impl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ readme = "../README.md"
[dependencies]
heck = "0.4.0"
log = "0.4"
proc-macro2 = "1.0"
quote = "1.0"
regress = "0.4.1"
proc-macro2 = { workspace = true }
quote = { workspace = true }
regress = { workspace = true }
rustfmt-wrapper = "0.2"
schemars = "0.8.11"
serde_json = "1.0"
syn = { version = "1.0", features = ["full"] }
schemars = { workspace = true }
serde_json = { workspace = true }
syn = { workspace = true, features = ["full"] }
thiserror = "1.0"
unicode-ident = "1.0.5"

[dev-dependencies]
expectorate = "1.0"
paste = "1.0"
schema = "0.0.1"
schemars = { version = "0.8.11", features = ["uuid1"] }
serde = "1.0"
uuid = "1.2.1"
schemars = { workspace = true, features = ["uuid1"] }
serde = { workspace = true }
uuid = "1.1.2"
12 changes: 6 additions & 6 deletions typify-macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ repository = "https://github.com/oxidecomputer/typify"
readme = "../README.md"

[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
schemars = "0.8.11"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
proc-macro2 = { workspace = true }
quote = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
serde_tokenstream = "0.1.3"
syn = "1.0"
syn = { workspace = true }
typify-impl = { version = "0.0.11-dev", path = "../typify-impl" }

[lib]
Expand Down