Skip to content

Commit

Permalink
crates: move diem-infallible to crates directory
Browse files Browse the repository at this point in the history
  • Loading branch information
bmwill authored and bors-libra committed Dec 3, 2021
1 parent 908404d commit 3047bab
Show file tree
Hide file tree
Showing 44 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ members = [
"common/debug-interface",
"common/diemdoc",
"common/id-generator",
"common/infallible",
"common/logger",
"common/logger/derive",
"common/metrics",
Expand Down Expand Up @@ -39,6 +38,7 @@ members = [
"crates/diem-crypto",
"crates/diem-crypto-derive",
"crates/diem-faucet",
"crates/diem-infallible",
"crates/diem-json-rpc-client",
"crates/diem-rest-client",
"crates/diem-workspace-hack",
Expand Down
2 changes: 1 addition & 1 deletion common/logger/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ chrono = "0.4.19"
erased-serde = "0.3.13"
hostname = "0.3.1"
diem-log-derive = { path = "derive" }
diem-infallible = { path = "../infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
once_cell = "1.7.2"
serde = { version = "1.0.124", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion common/rate-limiter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish = false
edition = "2018"

[dependencies]
diem-infallible = { path= "../infallible" }
diem-infallible = { path= "../../crates/diem-infallible" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
diem-logger = { path = "../logger" }
diem-metrics = { path = "../metrics" }
Expand Down
2 changes: 1 addition & 1 deletion common/time-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pin-project = { version = "1.0.5", optional = true }
thiserror = "1.0.24"
tokio = { version = "1.8.1", features = ["macros", "rt-multi-thread", "time"], optional = true }

diem-infallible = { path = "../infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion config/management/network-address-encryption/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ thiserror = "1.0.24"

bcs = "0.1.2"
diem-global-constants = { path = "../../global-constants"}
diem-infallible = { path = "../../../common/infallible" }
diem-infallible = { path = "../../../crates/diem-infallible" }
diem-logger = { path = "../../../common/logger" }
diem-secure-storage = { path = "../../../secure/storage" }
diem-types = { path = "../../../types" }
Expand Down
2 changes: 1 addition & 1 deletion config/management/operational/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ diem-client = { path = "../../../crates/diem-client", features = ["blocking"], d
diem-config = { path = "../.."}
diem-crypto = { path = "../../../crates/diem-crypto" }
diem-global-constants = { path = "../../global-constants" }
diem-infallible = { path = "../../../common/infallible" }
diem-infallible = { path = "../../../crates/diem-infallible" }
diem-management = { path = ".." }
diem-network-address-encryption = {path = "../network-address-encryption"}
diem-secure-storage = { path = "../../../secure/storage" }
Expand Down
2 changes: 1 addition & 1 deletion consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ diem-crypto = { path = "../crates/diem-crypto" }
diem-logger = { path = "../common/logger" }
diem-mempool = { path = "../mempool" }
diem-metrics = { path = "../common/metrics" }
diem-infallible = { path = "../common/infallible" }
diem-infallible = { path = "../crates/diem-infallible" }
diem-secure-storage = { path = "../secure/storage" }
diem-temppath = { path = "../common/temppath" }
diem-types = { path = "../types" }
Expand Down
2 changes: 1 addition & 1 deletion consensus/consensus-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ executor-types = { path = "../../execution/executor-types" }
bcs = "0.1.2"
diem-crypto = { path = "../../crates/diem-crypto" }
diem-crypto-derive = { path = "../../crates/diem-crypto-derive" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-types = { path = "../../types" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
short-hex-str = { path = "../../common/short-hex-str" }
Expand Down
2 changes: 1 addition & 1 deletion consensus/safety-rules/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ consensus-types = { path = "../consensus-types" }
diem-config = { path = "../../config" }
diem-crypto = { path = "../../crates/diem-crypto" }
diem-global-constants = { path = "../../config/global-constants"}
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-logger = { path = "../../common/logger" }
diem-proptest-helpers = { path = "../../common/proptest-helpers", optional = true }
diem-secure-net = { path = "../../secure/net" }
Expand Down
2 changes: 1 addition & 1 deletion crates/channel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edition = "2018"
anyhow = "1.0.38"
futures = "0.3.12"
diem-metrics = { path = "../../common/metrics" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/diem-faucet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ serde_json = "1.0.64"
tempfile = "3.2.0"

diem-config = { path = "../../config" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion diem-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ consensus = { path = "../consensus" }
consensus-notifications = { path = "../state-sync/inter-component/consensus-notifications" }
crash-handler = { path = "../common/crash-handler" }
data-streaming-service = { path = "../state-sync/state-sync-v2/data-streaming-service" }
diem-infallible = { path = "../common/infallible" }
diem-infallible = { path = "../crates/diem-infallible" }
debug-interface = { path = "../common/debug-interface" }
event-notifications = { path = "../state-sync/inter-component/event-notifications" }
executor = { path = "../execution/executor" }
Expand Down
2 changes: 1 addition & 1 deletion execution/execution-correctness/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ diem-config = { path = "../../config" }
diem-crypto = { path = "../../crates/diem-crypto" }
diem-global-constants = { path = "../../config/global-constants"}
diem-logger = { path = "../../common/logger" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-secure-net = { path = "../../secure/net" }
diem-secure-storage = { path = "../../secure/storage" }
diem-temppath = { path = "../../common/temppath" }
Expand Down
2 changes: 1 addition & 1 deletion execution/executor-benchmark/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ diemdb = { path = "../../storage/diemdb" }
diem-config = { path = "../../config" }
diem-crypto = { path = "../../crates/diem-crypto" }
diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-jellyfish-merkle = { path = "../../storage/jellyfish-merkle" }
diem-logger = { path = "../../common/logger" }
diem-types = { path = "../../types" }
Expand Down
2 changes: 1 addition & 1 deletion execution/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ bcs = "0.1.2"
diem-crypto = { path = "../../crates/diem-crypto" }
diem-logger = { path = "../../common/logger" }
diem-metrics = { path = "../../common/metrics" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-secure-net = { path = "../../secure/net" }
diem-state-view = { path = "../../storage/state-view" }
diem-types = { path = "../../types" }
Expand Down
2 changes: 1 addition & 1 deletion json-rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ diem-crypto = { path = "../crates/diem-crypto" }
diemdb = { path = "../storage/diemdb", optional = true }
diem-id-generator = { path = "../common/id-generator" }
diem-json-rpc-types = { path = "./types", package = "diem-json-rpc-types" }
diem-infallible = { path = "../common/infallible" }
diem-infallible = { path = "../crates/diem-infallible" }
diem-logger = { path = "../common/logger" }
diem-mempool = { path = "../mempool" }
diem-metrics = { path = "../common/metrics" }
Expand Down
2 changes: 1 addition & 1 deletion mempool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ diem-config = { path = "../config" }
diem-crypto = { path = "../crates/diem-crypto" }
diem-logger = { path = "../common/logger" }
diem-metrics = { path = "../common/metrics" }
diem-infallible = { path = "../common/infallible" }
diem-infallible = { path = "../crates/diem-infallible" }
diem-proptest-helpers = { path = "../common/proptest-helpers", optional = true }
diem-types = { path = "../types" }
diem-workspace-hack = { path = "../crates/diem-workspace-hack" }
Expand Down
2 changes: 1 addition & 1 deletion network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ diem-config = { path = "../config" }
diem-crypto = { path = "../crates/diem-crypto" }
diem-crypto-derive = { path = "../crates/diem-crypto-derive" }
diem-id-generator = { path = "../common/id-generator" }
diem-infallible = { path = "../common/infallible" }
diem-infallible = { path = "../crates/diem-infallible" }
diem-logger = { path = "../common/logger" }
diem-metrics = { path = "../common/metrics" }
diem-proptest-helpers = { path = "../common/proptest-helpers", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion network/builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ channel = { path = "../../crates/channel" }
bcs = "0.1.2"
diem-config = { path = "../../config" }
diem-crypto = { path = "../../crates/diem-crypto" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-logger = { path = "../../common/logger" }
diem-network-address-encryption = {path = "../../config/management/network-address-encryption"}
diem-secure-storage = { path = "../../secure/storage" }
Expand Down
2 changes: 1 addition & 1 deletion network/memsocket/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publish = false
futures = "0.3.12"
bytes = "1.0.1"
once_cell = "1.7.2"
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }

[features]
Expand Down
2 changes: 1 addition & 1 deletion secure/storage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ thiserror = "1.0.24"
bcs = "0.1.2"
diem-crypto = { path = "../../crates/diem-crypto" }
diem-github-client = { path = "github" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-logger = { path = "../../common/logger" }
diem-temppath = { path = "../../common/temppath" }
diem-time-service = { path = "../../common/time-service" }
Expand Down
2 changes: 1 addition & 1 deletion shuffle/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ diem-config = { path = "../../config" }
diem-crypto = { path = "../../crates/diem-crypto" }
diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" }
diem-genesis-tool = { path = "../../config/management/genesis" }
diem-infallible = { path = "../../common/infallible"}
diem-infallible = { path = "../../crates/diem-infallible"}
diem-json-rpc-types = { path = "../../json-rpc/types" }
diem-node = { path = "../../diem-node" }
diem-sdk = { path = "../../sdk" }
Expand Down
2 changes: 1 addition & 1 deletion state-sync/diem-data-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ thiserror = "1.0.24"
diem-config = { path = "../../config" }
diem-crypto = { path = "../../crates/diem-crypto" }
diem-id-generator = { path = "../../common/id-generator" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-logger = { path = "../../common/logger" }
diem-time-service = { path = "../../common/time-service", features = ["async"] }
diem-types = { path = "../../types" }
Expand Down
2 changes: 1 addition & 1 deletion state-sync/inter-component/event-notifications/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ tokio = { version = "1.8.1" }

channel = { path = "../../../crates/channel" }
diem-id-generator = { path = "../../../common/id-generator" }
diem-infallible = { path = "../../../common/infallible" }
diem-infallible = { path = "../../../crates/diem-infallible" }
diem-types = { path = "../../../types" }
diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" }
storage-interface = { path = "../../../storage/storage-interface" }
Expand Down
2 changes: 1 addition & 1 deletion state-sync/state-sync-v1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ consensus-notifications = { path = "../inter-component/consensus-notifications"
channel = { path = "../../crates/channel" }
diem-config = { path = "../../config" }
diem-crypto = { path = "../../crates/diem-crypto" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-logger = { path = "../../common/logger" }
diem-mempool = { path = "../../mempool"}
diem-metrics = { path = "../../common/metrics" }
Expand Down
2 changes: 1 addition & 1 deletion state-sync/state-sync-v2/data-streaming-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ diem-config = { path = "../../../config" }
diem-crypto = { path = "../../../crates/diem-crypto" }
diem-data-client = { path = "../../diem-data-client" }
diem-id-generator = { path = "../../../common/id-generator" }
diem-infallible = { path = "../../../common/infallible" }
diem-infallible = { path = "../../../crates/diem-infallible" }
diem-logger = { path = "../../../common/logger" }
diem-metrics = { path = "../../../common/metrics" }
diem-types = { path = "../../../types" }
Expand Down
2 changes: 1 addition & 1 deletion state-sync/state-sync-v2/state-sync-driver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ tokio-stream = "0.1.4"
consensus-notifications = { path = "../../inter-component/consensus-notifications" }
data-streaming-service = { path = "../data-streaming-service" }
diem-config = { path = "../../../config" }
diem-infallible = { path = "../../../common/infallible" }
diem-infallible = { path = "../../../crates/diem-infallible" }
diem-types = { path = "../../../types" }
diem-workspace-hack = { path = "../../../crates/diem-workspace-hack" }
event-notifications = { path = "../../inter-component/event-notifications" }
Expand Down
2 changes: 1 addition & 1 deletion state-sync/state-sync-v2/state-sync-multiplexer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ storage-interface = { path = "../../../storage/storage-interface" }
[dev-dependencies]
diem-crypto = { path = "../../../crates/diem-crypto" }
diem-genesis-tool = {path = "../../../config/management/genesis", features = ["testing"] }
diem-infallible = { path = "../../../common/infallible" }
diem-infallible = { path = "../../../crates/diem-infallible" }
diem-temppath = { path = "../../../common/temppath" }
diem-time-service = { path = "../../../common/time-service" }
diem-vm = { path = "../../../diem-move/diem-vm" }
Expand Down
2 changes: 1 addition & 1 deletion storage/backup/backup-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ diem-jellyfish-merkle = { path = "../../jellyfish-merkle" }
bcs = "0.1.2"
diem-config = { path = "../../../config" }
diem-crypto = { path = "../../../crates/diem-crypto" }
diem-infallible = { path = "../../../common/infallible" }
diem-infallible = { path = "../../../crates/diem-infallible" }
diem-logger = { path = "../../../common/logger" }
diem-secure-push-metrics = { path = "../../../secure/push-metrics" }
diem-temppath = { path = "../../../common/temppath" }
Expand Down
2 changes: 1 addition & 1 deletion storage/diemdb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ diem-crypto = { path = "../../crates/diem-crypto" }
diem-jellyfish-merkle = { path = "../jellyfish-merkle" }
diem-logger = { path = "../../common/logger" }
diem-metrics = { path = "../../common/metrics" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-proptest-helpers = { path = "../../common/proptest-helpers", optional = true }
diem-temppath = { path = "../../common/temppath", optional = true }
diem-types = { path = "../../types" }
Expand Down
2 changes: 1 addition & 1 deletion storage/jellyfish-merkle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ thiserror = "1.0.24"
bcs = "0.1.2"
diem-crypto = { path = "../../crates/diem-crypto" }
diem-crypto-derive = { path = "../../crates/diem-crypto-derive" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-metrics = { path = "../../common/metrics" }
diem-types = { path = "../../types" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
Expand Down
2 changes: 1 addition & 1 deletion storage/scratchpad-benchmark/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ diemdb = { path = "../diemdb" }
diem-config = { path = "../../config" }
diem-crypto = { path = "../../crates/diem-crypto" }
diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-logger = { path = "../../common/logger" }
diem-types = { path = "../../types" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
Expand Down
2 changes: 1 addition & 1 deletion storage/scratchpad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ proptest = { version = "1.0.0", optional = true }
rayon = "1.5.0"

diem-crypto = { path = "../../crates/diem-crypto" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-types = { path = "../../types" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }

Expand Down
2 changes: 1 addition & 1 deletion storage/storage-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ serde = "1.0.124"
bcs = "0.1.2"
diem-crypto = { path = "../../crates/diem-crypto" }
diem-logger = { path = "../../common/logger" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-secure-net = { path = "../../secure/net" }
diem-types = { path = "../../types" }
diem-workspace-hack = { path = "../../crates/diem-workspace-hack" }
Expand Down
2 changes: 1 addition & 1 deletion testsuite/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ diem-crypto = { path = "../../crates/diem-crypto" }
bcs = "0.1.2"
diem-wallet = { path = "diem-wallet" }
diem-client = { path = "../../crates/diem-client" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-logger = { path = "../../common/logger" }
diem-metrics = { path = "../../common/metrics" }
diem-types = { path = "../../types" }
Expand Down
2 changes: 1 addition & 1 deletion testsuite/cluster-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ diem-global-constants = { path = "../../config/global-constants" }
diem-logger = { path = "../../common/logger" }
diem-management = { path = "../../config/management", features = ["testing"] }
diem-mempool = { path = "../../mempool" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-network-address-encryption = { path = "../../config/management/network-address-encryption" }
diem-node = { path = "../../diem-node" }
diem-operational-tool = {path = "../../config/management/operational", features = ["testing"] }
Expand Down
2 changes: 1 addition & 1 deletion testsuite/smoke-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ debug-interface = { path = "../../common/debug-interface" }
generate-key = { path = "../../config/generate-key" }
diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] }
diem-global-constants = { path = "../../config/global-constants" }
diem-infallible = { path = "../../common/infallible" }
diem-infallible = { path = "../../crates/diem-infallible" }
diem-json-rpc = { path = "../../json-rpc" }
diem-json-rpc-types = { path = "../../json-rpc/types" }
diem-key-manager = { path = "../../secure/key-manager" }
Expand Down

0 comments on commit 3047bab

Please sign in to comment.