Skip to content

Update dependencies (new semver) and fix some compile warnings #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update dependencies (new semver) and fix some compile warnings #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
746423e
Update to new semver versions of dependencies
VorpalBlade Feb 10, 2024
188615f
The unused imports at the top level are intentional, quieten warnings
VorpalBlade Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions alpm-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ generate = ["bindgen"]
docs-rs = []

[build-dependencies]
bindgen = { version = "0.66.1", optional = true, default-features = false, features = ["runtime"] }
pkg-config = "0.3.27"
bindgen = { version = "0.69.4", optional = true, default-features = false, features = ["runtime"] }
pkg-config = "0.3.29"

[package.metadata.docs.rs]
features = [ "docs-rs" ]
4 changes: 2 additions & 2 deletions alpm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ checkver = []
docs-rs = ["alpm-sys/docs-rs"]

[dependencies]
bitflags = "1.3.2"
bitflags = "2.4.2"
libarchive = { version = "0.1.1", optional = true }
libarchive3-sys = { version = "0.1.2", optional = true }
alpm-sys = { path = "../alpm-sys", version = "2.1.3" }
Expand All @@ -37,7 +37,7 @@ alpm-sys = { path = "../alpm-sys", version = "2.1.3" }
alpm-sys = { path = "../alpm-sys", version = "2.1.3" }

[dev-dependencies]
criterion = "0.3.5"
criterion = "0.5.1"

[[bench]]
name = "list"
Expand Down
1 change: 1 addition & 0 deletions alpm/src/alpm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ pub fn version() -> &'static str {
}

bitflags! {
#[derive(Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone, Copy)]
pub struct Capabilities: u32 {
const NLS = alpm_caps::ALPM_CAPABILITY_NLS;
const DOWNLOADER = alpm_caps::ALPM_CAPABILITY_DOWNLOADER;
Expand Down
6 changes: 6 additions & 0 deletions alpm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,29 @@ mod version;

pub use crate::add::*;
pub use crate::alpm::*;
#[allow(unused_imports)]
pub use crate::be_local::*;
pub use crate::be_pkg::*;
#[allow(unused_imports)]
pub use crate::be_sync::*;
pub use crate::cb::*;
pub use crate::conflict::*;
pub use crate::db::*;
pub use crate::deps::*;
#[allow(unused_imports)]
pub use crate::dload::*;
pub use crate::error::*;
pub use crate::filelist::*;
#[allow(unused_imports)]
pub use crate::handle::*;
pub use crate::list::*;
#[cfg(feature = "mtree")]
pub use crate::mtree::*;
pub use crate::package::*;
#[allow(unused_imports)]
pub use crate::remove::*;
pub use crate::signing::*;
#[allow(unused_imports)]
pub use crate::sync::*;
pub use crate::trans::*;
pub use crate::types::*;
Expand Down
1 change: 1 addition & 0 deletions alpm/src/trans.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use std::ptr;
use bitflags::bitflags;

bitflags! {
#[derive(Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone, Copy)]
pub struct TransFlag: u32 {
const NONE = 0;
const NO_DEPS = ALPM_TRANS_FLAG_NODEPS;
Expand Down
4 changes: 4 additions & 0 deletions alpm/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ pub enum FetchResult {
}

bitflags! {
#[derive(Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone, Copy)]
pub struct SigLevel: u32 {
const NONE = 0;
const PACKAGE = ALPM_SIG_PACKAGE;
Expand All @@ -56,6 +57,7 @@ bitflags! {
}

bitflags! {
#[derive(Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone, Copy)]
pub struct Usage: u32 {
const NONE = 0;
const SYNC = ALPM_DB_USAGE_SYNC;
Expand All @@ -67,6 +69,7 @@ bitflags! {
}

bitflags! {
#[derive(Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Clone, Copy)]
pub struct LogLevel: u32 {
const NONE = 0;
const ERROR = ALPM_LOG_ERROR;
Expand Down Expand Up @@ -107,6 +110,7 @@ pub enum PackageReason {
}

bitflags! {
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
pub struct PackageValidation: u32 {
const UNKNOWN = ALPM_PKG_VALIDATION_UNKNOWN;
const NONE = ALPM_PKG_VALIDATION_NONE;
Expand Down