Skip to content

Commit 4cf6e63

Browse files
authored
Merge pull request #85 from artichoke/dev/lopopolo-edition-2024
Upgrade to edition 2024, prepare v1.3.0 release
2 parents ebd6fa2 + d40833f commit 4cf6e63

File tree

6 files changed

+27
-13
lines changed

6 files changed

+27
-13
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Install Rust toolchain
7272
uses: artichoke/setup-rust/[email protected]
7373
with:
74-
toolchain: "1.64.0"
74+
toolchain: "1.85.0"
7575

7676
- name: Compile
7777
run: cargo build --verbose

Cargo.toml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,32 @@
11
[package]
22
name = "sysdir"
3-
version = "1.2.2" # remember to set `html_root_url` in `src/lib.rs`.
3+
version = "1.3.0" # remember to set `html_root_url` in `src/lib.rs`.
44
authors = ["Ryan Lopopolo <[email protected]>"]
55
license = "Apache-2.0 OR MIT"
6-
edition = "2021"
7-
rust-version = "1.64.0"
6+
edition = "2024"
7+
rust-version = "1.85.0"
88
readme = "README.md"
99
repository = "https://github.com/artichoke/sysdir-rs"
1010
documentation = "https://docs.rs/sysdir"
1111
homepage = "https://github.com/artichoke/sysdir-rs"
1212
description = "Rust bindings to sysdir(3) on macOS, iOS, tvOS, and watchOS"
1313
keywords = ["app_dirs", "apple", "known-folder", "path", "sysdir"]
14-
categories = ["api-bindings", "filesystem", "no-std", "no-std::no-alloc", "os::macos-apis"]
15-
include = ["cext/**/*", "examples/**/*", "src/**/*", "tests/**/*", "LICENSE-*", "README.md", "sysdir.3"]
14+
categories = [
15+
"api-bindings",
16+
"filesystem",
17+
"no-std",
18+
"no-std::no-alloc",
19+
"os::macos-apis",
20+
]
21+
include = [
22+
"/cext/**/*",
23+
"/examples/**/*",
24+
"/src/**/*",
25+
"/tests/**/*",
26+
"/LICENSE-*",
27+
"/README.md",
28+
"/sysdir.3",
29+
]
1630

1731
[dependencies]
1832

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Add this to your `Cargo.toml`:
2323

2424
```toml
2525
[dependencies]
26-
sysdir = "1.2.2"
26+
sysdir = "1.3.0"
2727
```
2828

2929
Then resolve well-known directories like this:
@@ -75,7 +75,7 @@ sysdir-rs is `no_std` and only requires `core`.
7575

7676
## Minimum Supported Rust Version
7777

78-
This crate requires at least Rust 1.64.0. This version can be bumped in minor
78+
This crate requires at least Rust 1.85.0. This version can be bumped in minor
7979
releases.
8080

8181
## License

examples/enumerate_system_dirs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ mod platform {
7777
))]
7878
mod platform {
7979
use std::error::Error;
80-
use std::ffi::{c_char, CStr};
80+
use std::ffi::{CStr, c_char};
8181
use std::io::{self, Write as _};
8282

8383
use sysdir::{sysdir_search_path_directory_t::*, *};

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
//! ```
9393
9494
#![no_std]
95-
#![doc(html_root_url = "https://docs.rs/sysdir/1.2.2")]
95+
#![doc(html_root_url = "https://docs.rs/sysdir/1.3.0")]
9696

9797
// Ensure code blocks in `README.md` compile
9898
#[cfg(all(
@@ -150,7 +150,7 @@ pub use self::sys::*;
150150
)
151151
))]
152152
mod tests {
153-
use core::ffi::{c_char, CStr};
153+
use core::ffi::{CStr, c_char};
154154

155155
use super::*;
156156

src/sys.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ pub const SYSDIR_DOMAIN_MASK_NETWORK: sysdir_search_path_domain_mask_t = 4;
4848
pub const SYSDIR_DOMAIN_MASK_SYSTEM: sysdir_search_path_domain_mask_t = 8;
4949
pub const SYSDIR_DOMAIN_MASK_ALL: sysdir_search_path_domain_mask_t = 65535;
5050
pub type sysdir_search_path_domain_mask_t = ::core::ffi::c_uint;
51-
extern "C" {
51+
unsafe extern "C" {
5252
pub fn sysdir_start_search_path_enumeration(
5353
dir: sysdir_search_path_directory_t,
5454
domainMask: sysdir_search_path_domain_mask_t,
5555
) -> sysdir_search_path_enumeration_state;
5656
}
57-
extern "C" {
57+
unsafe extern "C" {
5858
pub fn sysdir_get_next_search_path_enumeration(
5959
state: sysdir_search_path_enumeration_state,
6060
path: *mut ::core::ffi::c_char,

0 commit comments

Comments
 (0)