Skip to content

Commit 8f9a0e5

Browse files
committed
v210.7.0+fbb36bb (2024 edition)
1 parent fa07bb9 commit 8f9a0e5

4 files changed

Lines changed: 10 additions & 8 deletions

File tree

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "luajit-src"
3-
version = "210.6.6+707c12b"
3+
version = "210.7.0+fbb36bb"
44
authors = ["Aleksandr Orlenko <zxteam@protonmail.com>"]
5-
edition = "2021"
5+
edition = "2024"
66
repository = "https://github.com/mlua-rs/luajit-src-rs"
77
keywords = ["lua", "luajit"]
88
readme = "README.md"

luajit_relver.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1767980792
1+
1774638290

src/lib.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use std::error::Error;
2+
use std::fmt::Display;
23
use std::path::{Path, PathBuf};
34
use std::process::Command;
45
use std::{env, fs, io};
@@ -127,11 +128,12 @@ impl Build {
127128
// Copy release version file
128129
let relver = build_dir.join(".relver");
129130
fs::copy(manifest_dir.join("luajit_relver.txt"), &relver)
130-
.context(|| format!("Cannot copy 'luajit_relver.txt'"))?;
131+
.context(|| "Cannot copy 'luajit_relver.txt'")?;
131132

132133
// Fix permissions for certain build situations
133134
let mut perms = (fs::metadata(&relver).map(|md| md.permissions()))
134135
.context(|| format!("Cannot read permissions for '{}'", relver.display()))?;
136+
#[allow(clippy::permissions_set_readonly_false)]
135137
perms.set_readonly(false);
136138
fs::set_permissions(&relver, perms)
137139
.context(|| format!("Cannot set permissions for '{}'", relver.display()))?;
@@ -266,7 +268,7 @@ impl Build {
266268
// Copy release version file
267269
let relver = build_dir.join(".relver");
268270
fs::copy(manifest_dir.join("luajit_relver.txt"), &relver)
269-
.context(|| format!("Cannot copy 'luajit_relver.txt'"))?;
271+
.context(|| "Cannot copy 'luajit_relver.txt'")?;
270272

271273
let mut msvcbuild = Command::new(build_dir.join("src").join("msvcbuild.bat"));
272274
msvcbuild.current_dir(build_dir.join("src"));
@@ -389,11 +391,11 @@ impl Artifacts {
389391
}
390392

391393
trait ErrorContext<T> {
392-
fn context(self, f: impl FnOnce() -> String) -> Result<T, DynError>;
394+
fn context<D: Display>(self, f: impl FnOnce() -> D) -> Result<T, DynError>;
393395
}
394396

395397
impl<T, E: Error> ErrorContext<T> for Result<T, E> {
396-
fn context(self, f: impl FnOnce() -> String) -> Result<T, DynError> {
398+
fn context<D: Display>(self, f: impl FnOnce() -> D) -> Result<T, DynError> {
397399
self.map_err(|e| format!("{}: {e}", f()).into())
398400
}
399401
}

0 commit comments

Comments
 (0)