Skip to content
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

Bump bitflags to 2.4.2 #49

Closed
wants to merge 2 commits into from
Closed

Bump bitflags to 2.4.2 #49

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
e13f5d9
Bump bitflags to `2.4.2`
baloo Mar 10, 2024
9749c48
Bump MSRV to 1.56.0
baloo Mar 11, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
os: [ubuntu-22.04, windows-2019, macos-12]
toolchain: [stable]
include:
- {os: ubuntu-22.04, toolchain: '1.38.0'}
- {os: ubuntu-22.04, toolchain: '1.56.0'}
- {os: ubuntu-22.04, toolchain: beta}
- {os: ubuntu-22.04, toolchain: nightly}

Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pcsc-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ rust-version = "1.38"
edition = "2018"

[build-dependencies]
pkg-config = "0.3.9"
pkg-config = "0.3.30"
4 changes: 2 additions & 2 deletions pcsc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ repository = "https://github.com/bluetech/pcsc-rust"
homepage = "https://github.com/bluetech/pcsc-rust"
readme = "../README.md"
authors = ["Ran Benita <[email protected]>"]
rust-version = "1.38"
rust-version = "1.56"
edition = "2018"

[dependencies]
bitflags = "1.2.1"
bitflags = "2"
pcsc-sys = { version = "1.2.0", path = "../pcsc-sys" }
2 changes: 2 additions & 0 deletions pcsc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ const DUMMY_DWORD: DWORD = 0xdead_beef;

bitflags! {
/// A mask of the state a card reader.
#[derive(Debug)]
pub struct State: DWORD {
const UNAWARE = ffi::SCARD_STATE_UNAWARE;
const IGNORE = ffi::SCARD_STATE_IGNORE;
Expand All @@ -148,6 +149,7 @@ bitflags! {
/// On Windows, Status always has exactly one bit set, and the bit values do
/// not correspond to underlying PC/SC constants. This allows Status to be
/// used in the same way across all platforms.
#[derive(Debug)]
pub struct Status: DWORD {
const UNKNOWN = {
#[cfg(not(target_os = "windows"))] { ffi::SCARD_UNKNOWN }
Expand Down
Loading