fix: totally fix rustc version check
C-style shit syntax
This commit is contained in:
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -1456,13 +1456,13 @@ dependencies = [
|
|||||||
"nyquest-preset",
|
"nyquest-preset",
|
||||||
"palc",
|
"palc",
|
||||||
"redb",
|
"redb",
|
||||||
"rustversion",
|
|
||||||
"sdgb-api",
|
"sdgb-api",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"snafu",
|
"snafu",
|
||||||
"spdlog-rs",
|
"spdlog-rs",
|
||||||
"strum 0.27.2",
|
"strum 0.27.2",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"version_check",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
@@ -29,4 +29,6 @@ nyquest-preset = { version = "0.2.0", features = ["async"] }
|
|||||||
palc = { version = "0.0.1", features = ["derive"] }
|
palc = { version = "0.0.1", features = ["derive"] }
|
||||||
futures-util = { version = "0.3.31", optional = true }
|
futures-util = { version = "0.3.31", optional = true }
|
||||||
ctrlc = { version = "3.4.7", features = ["termination"] }
|
ctrlc = { version = "3.4.7", features = ["termination"] }
|
||||||
rustversion = "1.0.21"
|
|
||||||
|
[build-dependencies]
|
||||||
|
version_check = "0.9.5"
|
||||||
|
|||||||
7
sdgb-cli/build.rs
Normal file
7
sdgb-cli/build.rs
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fn main() {
|
||||||
|
println!("cargo::rustc-check-cfg=cfg(file_lock_ready)");
|
||||||
|
|
||||||
|
if version_check::is_min_version("1.89") == Some(true) {
|
||||||
|
println!("cargo:rustc-cfg=file_lock_ready");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -201,6 +201,17 @@ async fn main() -> Result<(), Box<dyn snafu::Error>> {
|
|||||||
|
|
||||||
use crate::cache::{open_table_read, read_txn};
|
use crate::cache::{open_table_read, read_txn};
|
||||||
|
|
||||||
|
let file = OpenOptions::new()
|
||||||
|
.create(true)
|
||||||
|
.truncate(true)
|
||||||
|
.write(true)
|
||||||
|
.open("players.json")?;
|
||||||
|
|
||||||
|
#[cfg(file_lock_ready)]
|
||||||
|
file.try_lock()?;
|
||||||
|
|
||||||
|
let writer = BufWriter::new(file);
|
||||||
|
|
||||||
let txn = read_txn()?;
|
let txn = read_txn()?;
|
||||||
let table = open_table_read(&txn)?;
|
let table = open_table_read(&txn)?;
|
||||||
|
|
||||||
@@ -215,18 +226,6 @@ async fn main() -> Result<(), Box<dyn snafu::Error>> {
|
|||||||
.map(|(value, _)| value)
|
.map(|(value, _)| value)
|
||||||
.collect::<Vec<GetUserPreviewApiResp>>();
|
.collect::<Vec<GetUserPreviewApiResp>>();
|
||||||
|
|
||||||
let file = OpenOptions::new()
|
|
||||||
.create(true)
|
|
||||||
.truncate(true)
|
|
||||||
.write(true)
|
|
||||||
.open("players.json")?;
|
|
||||||
|
|
||||||
#[rustversion::since(1.89)]
|
|
||||||
{
|
|
||||||
file.lock()?;
|
|
||||||
}
|
|
||||||
|
|
||||||
let writer = BufWriter::new(file);
|
|
||||||
serde_json::to_writer(writer, &user_ids)?;
|
serde_json::to_writer(writer, &user_ids)?;
|
||||||
info!("dumped {} user id", user_ids.len());
|
info!("dumped {} user id", user_ids.len());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user