Fix compile with USDPL & nRPC v1.0

This commit is contained in:
NGnius (Graham) 2024-04-02 20:53:55 -04:00
parent 32d09219da
commit a0f565895b
5 changed files with 387 additions and 338 deletions

689
backend-rs/Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -11,11 +11,11 @@ readme = "../README.md"
[dependencies]
usdpl-back = { version = "0.11", features = ["blocking"], path = "../../usdpl-rs/usdpl-back"}
usdpl-back = { version = "1.0", features = ["blocking"], path = "../../usdpl-rs/usdpl-back"}
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
nrpc = { version = "0.10", path = "../../nRPC/nrpc" }
nrpc = { version = "1.0", path = "../../nRPC/nrpc", features = ["async-trait"] }
prost = "0.11"
tokio = { version = "1", features = ["sync", "rt"] }
@ -26,7 +26,7 @@ log = "0.4"
simplelog = "0.12"
[build-dependencies]
usdpl-build = { version = "0.11", path = "../../usdpl-rs/usdpl-build" }
usdpl-build = { version = "1.0", path = "../../usdpl-rs/usdpl-build" }
[profile.release]
debug = false

View File

@ -28,7 +28,7 @@ fn once_true() -> impl std::iter::Iterator<Item = bool> {
std::iter::once(true).chain(std::iter::repeat(false))
}
#[usdpl_back::nrpc::_helpers::async_trait::async_trait]
#[::nrpc::_helpers::async_trait::async_trait]
impl<'a> IFan<'a> for FanService {
async fn echo(
&mut self,

22
src/rust/Cargo.lock generated
View File

@ -17,17 +17,6 @@ version = "1.0.75"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
[[package]]
name = "async-trait"
version = "0.1.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.29",
]
[[package]]
name = "autocfg"
version = "1.1.0"
@ -429,9 +418,8 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
[[package]]
name = "nrpc"
version = "0.10.0"
version = "1.0.0"
dependencies = [
"async-trait",
"bytes",
"futures",
"prost",
@ -439,7 +427,7 @@ dependencies = [
[[package]]
name = "nrpc-build"
version = "0.10.0"
version = "1.0.0"
dependencies = [
"nrpc",
"prettyplease 0.2.12",
@ -803,7 +791,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "usdpl-build"
version = "0.11.0"
version = "1.0.0"
dependencies = [
"nrpc-build",
"prettyplease 0.2.12",
@ -816,14 +804,14 @@ dependencies = [
[[package]]
name = "usdpl-core"
version = "0.11.0"
version = "1.0.0"
dependencies = [
"base64",
]
[[package]]
name = "usdpl-front"
version = "0.11.0"
version = "1.0.0"
dependencies = [
"console_error_panic_hook",
"futures",

View File

@ -13,12 +13,12 @@ readme = "../../README.md"
crate-type = ["cdylib", "rlib"]
[dependencies]
usdpl-front = { version = "0.11", path = "../../../usdpl-rs/usdpl-front" }
nrpc = { version = "0.10", path = "../../../nRPC/nrpc", default-features = false }
usdpl-front = { version = "1.0", path = "../../../usdpl-rs/usdpl-front" }
nrpc = { version = "1.0", path = "../../../nRPC/nrpc", default-features = false }
prost = "0.11"
[build-dependencies]
usdpl-build = { version = "0.11", path = "../../../usdpl-rs/usdpl-build" }
usdpl-build = { version = "1.0", path = "../../../usdpl-rs/usdpl-build" }
[features]
debug = ["usdpl-front/debug"]