Merge pull request #2745 from lucab/ups/ci-bump-rust-linting

ci/rust: bump linting toolchain to latest stable (1.64)
This commit is contained in:
Colin Walters 2022-10-26 09:15:01 -04:00 committed by GitHub
commit 9672f88877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 18 deletions

View File

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

View File

@ -18,6 +18,7 @@ use std::process::abort;
///
/// # Return Value
/// 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>);
impl RepoCheckoutFilter {

View File

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

View File

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