Skip to content

Commit

Permalink
Merge #160
Browse files Browse the repository at this point in the history
160: Sort Cargo.toml entries. r=vext01 a=ltratt

In my experience it's easier to do things like updating dependencies if the entries are sorted alphabetically.

Co-authored-by: Laurence Tratt <laurie@tratt.net>
  • Loading branch information
bors[bot] and ltratt authored Nov 27, 2020
2 parents fe996bc + df0d205 commit efaeaa6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[workspace]
members=[
"ykcompile",
"ykpack",
"ykrt",
"yktrace",
"ykcompile",
"ykview",
]

Expand Down
6 changes: 3 additions & 3 deletions ykcompile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ license = "Apache-2.0 OR MIT"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
yktrace = { path = "../yktrace" }
ykpack = { path = "../ykpack" }
dynasmrt = "1.0.0"
hex = "0.4.2"
libc = "0.2.80"
lazy_static = "1.4.0"
libc = "0.2.80"
ykpack = { path = "../ykpack" }
yktrace = { path = "../yktrace" }

[build-dependencies]
cc = "1.0.62"
Expand Down
4 changes: 2 additions & 2 deletions ykpack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ edition = "2018"
license = "Apache-2.0 OR MIT"

[dependencies]
serde = { version = "1.0.115", features = ["derive"] }
fallible-iterator = "0.2.0"
bincode = "1.3.1"
fallible-iterator = "0.2.0"
serde = { version = "1.0.115", features = ["derive"] }
14 changes: 7 additions & 7 deletions yktrace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ edition = "2018"
license = "Apache-2.0 OR MIT"

[dependencies]
libc = "0.2.80"
fallible-iterator = "0.2.0"
ykpack = { path = "../ykpack" }
lazy_static = "1.4.0"
hwtracer = { git = "https://github.com/softdevteam/hwtracer" }
phdrs = { git = "https://github.com/softdevteam/phdrs" }
fxhash = "0.2.1"
gimli = "0.23.0"
object = "0.22.0"
hwtracer = { git = "https://github.com/softdevteam/hwtracer" }
lazy_static = "1.4.0"
libc = "0.2.80"
memmap = "0.7.0"
fxhash = "0.2.1"
object = "0.22.0"
phdrs = { git = "https://github.com/softdevteam/phdrs" }
ykpack = { path = "../ykpack" }

[dev-dependencies]
fm = "0.1.4"
Expand Down

0 comments on commit efaeaa6

Please sign in to comment.