packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2643 from cgwalters/rust-2021 

rust: Switch to 2021 edition, bump MSRV, a few `format!` updates
This commit is contained in:
Colin Walters 2022-06-13 09:10:36 -04:00 committed by GitHub
parent 68d1f54c5a 93e3784b66
commit e65c8e72c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/rust.yml vendored
View File

@ -15,7 +15,7 @@ env:
# TODO: Automatically query this from the C side # TODO: Automatically query this from the C side
LATEST_LIBOSTREE: "v2022_5" LATEST_LIBOSTREE: "v2022_5"
# Minimum supported Rust version (MSRV) # Minimum supported Rust version (MSRV)
ACTION_MSRV_TOOLCHAIN: 1.54.0 ACTION_MSRV_TOOLCHAIN: 1.58.1
# Pinned toolchain for linting # Pinned toolchain for linting
ACTION_LINTS_TOOLCHAIN: 1.56.0 ACTION_LINTS_TOOLCHAIN: 1.56.0

2
Cargo.toml
View File

@ -2,7 +2,7 @@
authors = ["Felix Krull"] authors = ["Felix Krull"]
description = "Rust bindings for libostree" description = "Rust bindings for libostree"
documentation = "https://docs.rs/ostree" documentation = "https://docs.rs/ostree"
edition = "2018" edition = "2021"
keywords = ["ostree", "libostree"] keywords = ["ostree", "libostree"]
license = "MIT" license = "MIT"
name = "ostree" name = "ostree"

2
rust-bindings/src/object_name.rs
View File

@ -86,7 +86,7 @@ mod tests {
#[test] #[test]
fn should_stringify_object_name() { fn should_stringify_object_name() {
let object_name = ObjectName::new("abcdef123456", ObjectType::DirTree); let object_name = ObjectName::new("abcdef123456", ObjectType::DirTree);
let stringified = format!("{}", object_name); let stringified = format!("{object_name}");
assert_eq!(stringified, "abcdef123456.dirtree"); assert_eq!(stringified, "abcdef123456.dirtree");
} }

2
rust-bindings/sys/Cargo.toml
View File

@ -73,7 +73,7 @@ links = "ostree-1"
name = "ostree-sys" name = "ostree-sys"
repository = "https://github.com/ostreedev/ostree-rs" repository = "https://github.com/ostreedev/ostree-rs"
version = "0.10.0" version = "0.10.0"
edition = "2018" edition = "2021"
[package.metadata.docs.rs] [package.metadata.docs.rs]
features = ["dox"] features = ["dox"]
[package.metadata.system-deps.ostree_1] [package.metadata.system-deps.ostree_1]

2
tests/inst/Cargo.toml
View File

@ -2,7 +2,7 @@
name = "ostree-test" name = "ostree-test"
version = "0.1.0" version = "0.1.0"
authors = ["Colin Walters <walters@verbum.org>"] authors = ["Colin Walters <walters@verbum.org>"]
edition = "2018" edition = "2021"
[workspace] [workspace]

4
tests/inst/src/destructive.rs
View File

@ -363,7 +363,7 @@ fn impl_transaction_test<M: AsRef<str>>(
booted: booted_commit.to_string(), booted: booted_commit.to_string(),
orig: sysrepo_obj.resolve_rev(ORIGREF, false)?.unwrap().into(), orig: sysrepo_obj.resolve_rev(ORIGREF, false)?.unwrap().into(),
prev: srvrepo_obj prev: srvrepo_obj
.resolve_rev(&format!("{}^", TESTREF), false)? .resolve_rev(&format!("{TESTREF}^"), false)?
.unwrap() .unwrap()
.into(), .into(),
target: srvrepo_obj.resolve_rev(TESTREF, false)?.unwrap().into(), target: srvrepo_obj.resolve_rev(TESTREF, false)?.unwrap().into(),
@ -568,7 +568,7 @@ pub(crate) fn itest_transactionality() -> Result<()> {
..Default::default() ..Default::default()
}; };
with_webserver_in(&srvrepo, &webserver_opts, move |addr| { with_webserver_in(&srvrepo, &webserver_opts, move |addr| {
let url = format!("http://{}", addr); let url = format!("http://{addr}");
bash!( bash!(
"ostree remote delete --if-exists testrepo "ostree remote delete --if-exists testrepo
ostree remote add --set=gpg-verify=false testrepo ${url}", ostree remote add --set=gpg-verify=false testrepo ${url}",

8
tests/inst/src/treegen.rs
View File

@ -31,9 +31,9 @@ pub(crate) fn mkvroot<P: AsRef<Path>>(p: P, v: u32) -> Result<()> {
std::fs::create_dir_all(p.join(v))?; std::fs::create_dir_all(p.join(v))?;
} }
let verpath = p.join("etc/.mkrootversion"); let verpath = p.join("etc/.mkrootversion");
write_file(&verpath, &format!("{}", v))?; write_file(&verpath, &format!("{v}"))?;
write_file(p.join("usr/bin/somebinary"), &format!("somebinary v{}", v))?; write_file(p.join("usr/bin/somebinary"), &format!("somebinary v{v}"))?;
write_file(p.join("etc/someconf"), &format!("someconf v{}", v))?; write_file(p.join("etc/someconf"), &format!("someconf v{v}"))?;
write_file(p.join("usr/bin/vmod2"), &format!("somebinary v{}", v % 2))?; write_file(p.join("usr/bin/vmod2"), &format!("somebinary v{}", v % 2))?;
write_file(p.join("usr/bin/vmod3"), &format!("somebinary v{}", v % 3))?; write_file(p.join("usr/bin/vmod3"), &format!("somebinary v{}", v % 3))?;
Ok(()) Ok(())
@ -134,7 +134,7 @@ pub(crate) fn update_os_tree<P: AsRef<Path>>(
tempdir.ensure_dir(v, 0o755)?; tempdir.ensure_dir(v, 0o755)?;
let dest = tempdir.sub_dir(v)?; let dest = tempdir.sub_dir(v)?;
mutated += mutate_executables_to(&src, &dest, percentage) mutated += mutate_executables_to(&src, &dest, percentage)
.with_context(|| format!("Replacing binaries in {}", v))?; .with_context(|| format!("Replacing binaries in {v}"))?;
} }
} }
} }