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

Bump regex from 1.4.2 to 1.4.3 #34

Closed
wants to merge 1 commit into from
Closed

Bump regex from 1.4.2 to 1.4.3 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9,098 changes: 4,718 additions & 4,380 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions common/datatest-stable/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[package]
name = "datatest-stable"
version = "0.1.0"
authors = ["Libra Association <opensource@libra.org>"]
description = "Libra datatest stable"
repository = "https://github.com/libra/libra"
homepage = "https://libra.org"
authors = ["Diem Association <opensource@diem.com>"]
description = "Diem datatest stable"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
license = "Apache-2.0"
publish = false
edition = "2018"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
regex = "1.3.9"
regex = "1.4.3"
walkdir = "2.3.1"
structopt = "0.3.17"
termcolor = "1.1.0"
libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
structopt = "0.3.21"
termcolor = "1.1.2"
diem-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }

[[test]]
name = "example"
Expand Down
32 changes: 32 additions & 0 deletions common/diemdoc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[package]
name = "diem-documentation-tool"
version = "0.1.0"
authors = ["Diem Association <opensource@diem.com>"]
description = "Diem transaction-builder"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
license = "Apache-2.0"
edition = "2018"

[dependencies]
serde_yaml = "0.8.14"
serde-reflection = "0.3.2"
serde-generate = "0.17.0"
anyhow = "1.0.37"
regex = "1.4.3"
structopt = "0.3.21"
once_cell = "1.4.1"

diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }

[dev-dependencies]
serde = { version = "1.0.117", features = ["derive"] }
tempfile = "3.1.0"

[features]
default = []

[[bin]]
name = "diemdoc"
path = "src/main.rs"
test = false
30 changes: 17 additions & 13 deletions devtools/x/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
[package]
name = "x"
version = "0.1.0"
authors = ["Libra Association <opensource@libra.org>"]
description = "Libra extended cargo tasks"
authors = ["Diem Association <opensource@diem.com>"]
description = "Diem extended cargo tasks"
edition = "2018"
publish = false
license = "Apache-2.0"

[dependencies]
serde = { version = "1.0.116", features = ["derive"] }
serde_json = "1.0.57"
structopt = "0.3.17"
anyhow = "1.0.32"
determinator = "0.1.1"
serde = { version = "1.0.117", features = ["derive"] }
serde_json = "1.0.61"
structopt = "0.3.21"
anyhow = "1.0.37"
colored-diff = "0.2.2"
guppy = { version = "0.5.0", features = ["summaries"] }
indoc = "1.0.2"
toml = "0.5.6"
env_logger = "0.7.1"
guppy = { version = "0.6.2", features = ["summaries"] }
indoc = "1.0.3"
toml = "0.5.8"
env_logger = "0.8.2"
log = "0.4.11"
chrono = "0.4.15"
glob = "0.3.0"
chrono = "0.4.19"
globset = "0.4.6"
regex = "1.4.3"
rayon = "1.5.0"
indexmap = "1.6.1"
x-core = { version = "0.1.0", path = "../x-core" }
x-lint = { version = "0.1.0", path = "../x-lint" }
libra-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
30 changes: 15 additions & 15 deletions language/move-core/types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
[package]
name = "move-core-types"
version = "0.1.0"
authors = ["Libra Association <opensource@libra.org>"]
authors = ["Diem Association <opensource@diem.com>"]
description = "Core types for Move"
repository = "https://github.com/libra/libra"
homepage = "https://libra.org"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
license = "Apache-2.0"
publish = false
edition = "2018"

[dependencies]
anyhow = "1.0.32"
anyhow = "1.0.37"
hex = "0.4.2"
rand = "0.7.3"
proptest = { version = "0.10.1", default-features = false, optional = true }
mirai-annotations = "1.10.1"
proptest-derive = { version = "0.2.0", default-features = false, optional = true }
ref-cast = "1.0.2"
serde = { version = "1.0.116", default-features = false }
ref-cast = "1.0.6"
serde = { version = "1.0.117", default-features = false }
serde_bytes = "0.11.5"
static_assertions = "1.1.0"
thiserror = "1.0.20"
thiserror = "1.0.23"
once_cell = "1.4.1"

lcs = { path = "../../../common/lcs", version = "0.1.0", package = "libra-canonical-serialization" }
libra-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.0" }
libra-crypto = { path = "../../../crypto/crypto", version = "0.1.0", default-features = false }
libra-crypto-derive = { path = "../../../crypto/crypto-derive", version = "0.1.0" }
bcs = "0.1.2"
diem-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.0" }
diem-crypto = { path = "../../../crypto/crypto", version = "0.1.0", default-features = false }
diem-crypto-derive = { path = "../../../crypto/crypto-derive", version = "0.1.0" }
short-hex-str = { path = "../../../common/short-hex-str", version = "0.1.0" }

[dev-dependencies]
once_cell = "1.4.1"
proptest = "0.10.1"
proptest-derive = "0.2.0"
regex = "1.3.9"
serde_json = "1.0.57"
regex = "1.4.3"
serde_json = "1.0.61"

[features]
default = ["fiat"]
fiat = ["libra-crypto/fiat"]
vanilla = ["libra-crypto/vanilla"]
fiat = ["diem-crypto/fiat"]
vanilla = ["diem-crypto/vanilla-u64"]
fuzzing = ["proptest", "proptest-derive"]
20 changes: 12 additions & 8 deletions language/move-lang/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
[package]
name = "move-lang"
version = "0.0.1"
authors = ["Libra Association <opensource@libra.org>"]
authors = ["Diem Association <opensource@diem.com>"]
publish = false
edition = "2018"
license = "Apache-2.0"

[dependencies]
anyhow = "1.0.32"
anyhow = "1.0.37"
codespan = "0.8.0"
codespan-reporting = "0.8.0"
hex = "0.4.2"
regex = "1.3.9"
structopt = "0.3.17"
regex = "1.4.3"
structopt = "0.3.21"
difference = "2.0.0"
petgraph = "0.5.1"
datatest-stable = { path = "../../common/datatest-stable", version = "0.1.0" }
walkdir = "2.3.1"
tempfile = "3.1.0"

move-vm = { path = "../vm", package = "vm" }
move-core-types = { path = "../move-core/types" }
move-bytecode-verifier = { path = "../bytecode-verifier", package = "bytecode-verifier" }
libra-types = { path = "../../types" }
libra-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
diem-types = { path = "../../types" }
diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
move-ir-types = {path = "../move-ir/types" }
ir-to-bytecode = {path = "../compiler/ir-to-bytecode" }
borrow-graph = { path = "../borrow-graph" }
bytecode-source-map = { path = "../compiler/bytecode-source-map" }
lcs = { path = "../../common/lcs", version = "0.1.0", package = "libra-canonical-serialization" }
bcs = "0.1.2"

[dev-dependencies]
move-lang-test-utils = { path = "test-utils" }
datatest-stable = { path = "../../common/datatest-stable" }

[[test]]
name = "move_check_testsuite"
Expand Down
14 changes: 14 additions & 0 deletions language/move-lang/ir-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[package]
name = "move-lang-ir-utils"
version = "0.1.0"
authors = ["Diem Association <opensource@diem.com>"]
publish = false
edition = "2018"
license = "Apache-2.0"

[dependencies]
diem-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.0" }
structopt = "0.3.21"
move-lang = { path = ".." }
move-lang-test-utils = { path = "../test-utils" }
regex = "1.4.3"
37 changes: 37 additions & 0 deletions language/move-model/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[package]
name = "move-model"
version = "0.1.0"
authors = ["Diem Association <opensource@diem.com>"]
publish = false
edition = "2018"
license = "Apache-2.0"

[dependencies]
# diem dependencies
move-lang = { path = "../move-lang", version = "0.0.1" }
bytecode-verifier = { path = "../bytecode-verifier", version = "0.1.0" }
vm = { path = "../vm", version = "0.1.0" }
diem-types = { path = "../../types", version = "0.1.0" }
diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
bytecode-source-map = { path = "../compiler/bytecode-source-map", version = "0.1.0" }
move-ir-types = { path = "../move-ir/types", version = "0.1.0" }
move-core-types = { path = "../move-core/types", version = "0.1.0" }

# external dependencies
codespan = "0.8.0"
codespan-reporting = "0.8.0"
itertools = "0.10.0"
log = "0.4.11"
num = "0.3.0"
once_cell = "1.4.1"
regex = "1.4.3"
anyhow = "1.0.37"
serde = { version = "1.0.117", features = ["derive"] }

[dev-dependencies]
datatest-stable = { path = "../../common/datatest-stable", version = "0.1.0" }
move-prover-test-utils = { path = "../move-prover/test-utils", version = "0.1.0" }

[[test]]
name = "testsuite"
harness = false
34 changes: 18 additions & 16 deletions language/move-prover/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,51 @@
[package]
name = "move-prover"
version = "0.1.0"
authors = ["Libra Association <opensource@libra.org>"]
authors = ["Diem Association <opensource@diem.com>"]
publish = false
edition = "2018"
license = "Apache-2.0"

[dependencies]
# libra dependencies
# diem dependencies
move-lang = { path = "../move-lang", version = "0.0.1" }
spec-lang = { path = "spec-lang", version = "0.1.0" }
move-model = { path = "../move-model", version = "0.1.0" }
docgen = { path = "docgen", version = "0.1.0" }
abigen = { path = "abigen", version = "0.1.0" }
errmapgen = { path = "errmapgen", version = "0.1.0" }
bytecode = { path = "bytecode", version = "0.1.0"}
vm = { path = "../vm", version = "0.1.0" }
libra-types = { path = "../../types", version = "0.1.0" }
libra-temppath = { path = "../../common/temppath", version = "0.1.0" }
libra-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
diem-types = { path = "../../types", version = "0.1.0" }
diem-temppath = { path = "../../common/temppath", version = "0.1.0" }
diem-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
bytecode-source-map = { path = "../compiler/bytecode-source-map", version = "0.1.0" }
move-ir-types = { path = "../move-ir/types", version = "0.1.0" }

# external dependencies
async-trait = "0.1.38"
anyhow = "1.0.32"
async-trait = "0.1.42"
anyhow = "1.0.37"
clap = "2.33.3"
codespan = "0.8.0"
codespan-reporting = "0.8.0"
futures = "0.3.5"
handlebars = "3.4.0"
itertools = "0.9.0"
futures = "0.3.8"
handlebars = "3.5.2"
hex = "0.4.2"
itertools = "0.10.0"
log = "0.4.11"
num = "0.3.0"
pretty = "0.10.0"
rand = "0.7.3"
regex = "1.3.9"
serde = { version = "1.0.116", features = ["derive"] }
simplelog = "0.8.0"
regex = "1.4.3"
serde = { version = "1.0.117", features = ["derive"] }
serde_json = "1.0.61"
simplelog = "0.9.0"
once_cell = "1.4.1"
tokio = { version = "0.2", features = ["full"] }
toml = "0.5.6"
toml = "0.5.8"

[dev-dependencies]
datatest-stable = { path = "../../common/datatest-stable", version = "0.1.0" }
test-utils = { path = "test-utils", version = "0.1.0" }
move-prover-test-utils = { path = "test-utils", version = "0.1.0" }
shell-words = "1.0.0"

[[test]]
Expand Down
10 changes: 5 additions & 5 deletions language/move-prover/diagen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "diagen"
version = "0.1.0"
authors = ["Libra Association <opensource@libra.org>"]
authors = ["Diem Association <opensource@diem.com>"]
edition = "2018"
license = "Apache-2.0"
publish = false
Expand All @@ -10,9 +10,9 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
# libra dependencies
libra-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.0" }
# diem dependencies
diem-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.0" }

# external dependencies
anyhow = "1.0.32"
regex = "1.3.9"
anyhow = "1.0.37"
regex = "1.4.3"
20 changes: 10 additions & 10 deletions language/move-prover/docgen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
[package]
name = "docgen"
version = "0.1.0"
authors = ["Libra Association <opensource@libra.org>"]
authors = ["Diem Association <opensource@diem.com>"]
publish = false
edition = "2018"
license = "Apache-2.0"

[dependencies]
# libra dependencies
spec-lang = { path = "../spec-lang", version = "0.1.0" }
# diem dependencies
move-model = { path = "../../move-model", version = "0.1.0" }
bytecode = { path = "../bytecode", version = "0.1.0"}
libra-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.0" }
diem-workspace-hack = { path = "../../../common/workspace-hack", version = "0.1.0" }

# external dependencies
codespan = "0.8.0"
codespan-reporting = "0.8.0"
itertools = "0.9.0"
itertools = "0.10.0"
log = "0.4.11"
num = "0.3.0"
regex = "1.3.9"
anyhow = "1.0.32"
serde = { version = "1.0.116", features = ["derive"] }
regex = "1.4.3"
anyhow = "1.0.37"
serde = { version = "1.0.117", features = ["derive"] }
once_cell = "1.4.1"

[dev-dependencies]
move-prover = { path = "..", version = "0.1.0" }
datatest-stable = { path = "../../../common/datatest-stable", version = "0.1.0" }
test-utils = { path = "../test-utils", version = "0.1.0" }
libra-temppath = { path = "../../../common/temppath", version = "0.1.0" }
move-prover-test-utils = { path = "../test-utils", version = "0.1.0" }
diem-temppath = { path = "../../../common/temppath", version = "0.1.0" }

[[test]]
name = "testsuite"
Expand Down
Loading