Skip to content

Commit

Permalink
Merge pull request #5070 from cgwalters/quiet-build-warnings
Browse files Browse the repository at this point in the history
rust: Squash two minor build warnings
  • Loading branch information
jmarrero authored Aug 29, 2024
2 parents fa51aa4 + fa49448 commit cd6fd88
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
1 change: 1 addition & 0 deletions rust/src/tokio_ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: Apache-2.0 OR MIT

pub(crate) struct TokioHandle(tokio::runtime::Handle);
#[allow(dead_code)]
pub(crate) struct TokioEnterGuard<'a>(tokio::runtime::EnterGuard<'a>);

pub(crate) fn tokio_handle_get() -> Box<TokioHandle> {
Expand Down
11 changes: 0 additions & 11 deletions rust/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -640,17 +640,6 @@ pub(crate) fn calculate_advisories_diff(
Ok(p as *mut _)
}

pub(crate) fn print_treepkg_diff(sysroot: &str) {
unsafe {
crate::ffi::print_treepkg_diff_from_sysroot_path(
sysroot,
crate::ffi::RpmOstreeDiffPrintFormat::RPMOSTREE_DIFF_PRINT_FORMAT_FULL_MULTILINE,
0,
std::ptr::null_mut(),
);
}
}

/// Implementation of https://github.com/rust-lang/rust/issues/82901 until it's stable.
pub(crate) trait OptionExtGetOrInsertDefault<T> {
fn ext_get_or_insert_default(&mut self) -> &mut T;
Expand Down

0 comments on commit cd6fd88

Please sign in to comment.