diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2331cc6..75108b1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,7 @@ jobs: # glog/log_severity.h(57): fatal error C1189: #error: ERROR macro is defined. Define # GLOG_NO_ABBREVIATED_SEVERITIES before including logging.h. See the document for detail. os: [ "ubuntu-latest", "macos-latest" ] - rust_toolchain: [ "1.67", "stable" ] + rust_toolchain: [ "1.85", "stable" ] steps: - uses: actions/checkout@v6 @@ -73,7 +73,7 @@ jobs: matrix: # Help needed for Windows, vcpkg builds it, but I don't know how to make it discoverable os: [ "ubuntu-latest", "macos-latest" ] - rust_toolchain: [ "1.67", "stable" ] + rust_toolchain: [ "1.85", "stable" ] steps: - uses: actions/checkout@v6 diff --git a/Cargo.toml b/Cargo.toml index f4153a1..696099a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "ceres-solver" -version = "0.4.0" -edition = "2021" +version = "0.5.0" +edition = "2024" readme = "README.md" description = "Safe Rust bindings for the Ceres Solver" repository = "https://github.com/light-curve/ceres-solver-rs" license = "MIT OR Apache-2.0" -rust-version = "1.67.0" +rust-version = "1.85.0" exclude = [".github"] [workspace] @@ -22,7 +22,7 @@ source = ["ceres-solver-sys/source"] default = ["system"] [dependencies.ceres-solver-sys] -version = "0.4.0" +version = "0.5.0" path = "./ceres-solver-sys" [dependencies.thiserror] diff --git a/ceres-solver-src/Cargo.toml b/ceres-solver-src/Cargo.toml index af6887d..b92b6dd 100644 --- a/ceres-solver-src/Cargo.toml +++ b/ceres-solver-src/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "ceres-solver-src" -version = "0.4.0+ceres2.2.0-eigen3.4.0-glog0.7.1" -edition = "2021" +version = "0.5.0+ceres2.2.0-eigen3.4.0-glog0.7.1" +edition = "2024" links = "ceres" readme = "README.md" description = "Rust distribution of Ceres Solver built as a minimal static library" repository = "https://github.com/light-curve/ceres-solver-rs" license = "MIT OR Apache-2.0" -rust-version = "1.57.0" +rust-version = "1.85.0" [build-dependencies] cmake = "0.1" diff --git a/ceres-solver-sys/Cargo.toml b/ceres-solver-sys/Cargo.toml index 098d018..0952e1e 100644 --- a/ceres-solver-sys/Cargo.toml +++ b/ceres-solver-sys/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "ceres-solver-sys" -version = "0.4.2" -edition = "2021" +version = "0.5.0" +edition = "2024" readme = "README.md" description = "Unsafe Rust bindings for the Ceres Solver" repository = "https://github.com/light-curve/ceres-solver-rs" license = "MIT OR Apache-2.0" -rust-version = "1.67.0" +rust-version = "1.85.0" [features] system = ["pkg-config"] @@ -15,17 +15,16 @@ source = ["ceres-solver-src"] default = ["system"] [dependencies.ceres-solver-src] -version = "0.4.0" +version = "0.5.0" path = "../ceres-solver-src" optional = true [dependencies.cxx] -version = "1,<=1.0.129" # 1.0.130 requires MSRV 1.70 +version = "1" features = ["c++17"] [build-dependencies] -cmake = "0.1" -cxx-build = "1,<=1.0.129" # 1.0.130 requires MSRV 1.70 +cxx-build = "1" pkg-config = { version = "0.3", optional = true } [dev-dependencies] diff --git a/src/solver.rs b/src/solver.rs index 061ce4e..13f253f 100644 --- a/src/solver.rs +++ b/src/solver.rs @@ -3,7 +3,7 @@ use crate::error::SolverOptionsBuildingError; use crate::residual_block::ResidualBlockId; -use ceres_solver_sys::cxx::{let_cxx_string, UniquePtr}; +use ceres_solver_sys::cxx::{UniquePtr, let_cxx_string}; use ceres_solver_sys::ffi; pub use ceres_solver_sys::ffi::{ DenseLinearAlgebraLibraryType, DoglegType, DumpFormatType, LineSearchDirectionType,