shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-18 10:04:17 +03:00
Code Issues Projects Releases Wiki Activity

ci/rust: bump linting toolchain to latest stable (1.64)

Browse Source 
This bumps the Rust toolchain for clippy/rustfmt to 1.64.
This commit is contained in:
Luca BRUNO 2022-10-26 06:46:09 +00:00
parent 9801689c74
commit 9163665a29
No known key found for this signature in database
GPG Key ID: A9834A2252078E4E
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ env:
# Minimum supported Rust version (MSRV) # Minimum supported Rust version (MSRV)
ACTION_MSRV_TOOLCHAIN: 1.58.1 ACTION_MSRV_TOOLCHAIN: 1.58.1
# Pinned toolchain for linting # Pinned toolchain for linting
ACTION_LINTS_TOOLCHAIN: 1.56.0 ACTION_LINTS_TOOLCHAIN: 1.64.0
jobs: jobs:
build: build:

1
rust-bindings/src/repo_checkout_at_options/repo_checkout_filter.rs
View File

@ -18,6 +18,7 @@ use std::process::abort;
/// ///
/// # Return Value /// # Return Value
/// The return value determines whether the current file is checked out or skipped. /// The return value determines whether the current file is checked out or skipped.
#[allow(clippy::type_complexity)]
pub struct RepoCheckoutFilter(Box<dyn Fn(&Repo, &Path, &libc::stat) -> RepoCheckoutFilterResult>); pub struct RepoCheckoutFilter(Box<dyn Fn(&Repo, &Path, &libc::stat) -> RepoCheckoutFilterResult>);
impl RepoCheckoutFilter { impl RepoCheckoutFilter {

10
rust-bindings/src/sysroot_deploy_tree_opts.rs
View File

@ -3,6 +3,7 @@ use glib::translate::*;
use libc::c_char; use libc::c_char;
/// Options for deploying an ostree commit. /// Options for deploying an ostree commit.
#[derive(Default)]
pub struct SysrootDeployTreeOpts<'a> { pub struct SysrootDeployTreeOpts<'a> {
/// Use these kernel arguments. /// Use these kernel arguments.
pub override_kernel_argv: Option<&'a [&'a str]>, pub override_kernel_argv: Option<&'a [&'a str]>,
@ -10,15 +11,6 @@ pub struct SysrootDeployTreeOpts<'a> {
pub overlay_initrds: Option<&'a [&'a str]>, pub overlay_initrds: Option<&'a [&'a str]>,
} }
impl<'a> Default for SysrootDeployTreeOpts<'a> {
fn default() -> Self {
SysrootDeployTreeOpts {
override_kernel_argv: None,
overlay_initrds: None,
}
}
}
type OptionStrSliceStorage<'a> = type OptionStrSliceStorage<'a> =
<Option<&'a [&'a str]> as ToGlibPtr<'a, *mut *mut c_char>>::Storage; <Option<&'a [&'a str]> as ToGlibPtr<'a, *mut *mut c_char>>::Storage;

9
rust-bindings/src/sysroot_write_deployments_opts.rs
View File

@ -2,19 +2,12 @@ use ffi::OstreeSysrootWriteDeploymentsOpts;
use glib::translate::*; use glib::translate::*;
/// Options for writing a deployment. /// Options for writing a deployment.
#[derive(Default)]
pub struct SysrootWriteDeploymentsOpts { pub struct SysrootWriteDeploymentsOpts {
/// Perform cleanup after writing the deployment. /// Perform cleanup after writing the deployment.
pub do_postclean: bool, pub do_postclean: bool,
} }
impl Default for SysrootWriteDeploymentsOpts {
fn default() -> Self {
SysrootWriteDeploymentsOpts {
do_postclean: false,
}
}
}
impl<'a> ToGlibPtr<'a, *const OstreeSysrootWriteDeploymentsOpts> for SysrootWriteDeploymentsOpts { impl<'a> ToGlibPtr<'a, *const OstreeSysrootWriteDeploymentsOpts> for SysrootWriteDeploymentsOpts {
type Storage = Box<OstreeSysrootWriteDeploymentsOpts>; type Storage = Box<OstreeSysrootWriteDeploymentsOpts>;