Skip to content

Commit

Permalink
Use v2 cargo resolver
Browse files Browse the repository at this point in the history
The 2021 usually implies resolver v2, and warns otherwise.
  • Loading branch information
nyurik authored and emilio committed Nov 29, 2024
1 parent 7ca75a6 commit 72e85ef
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
"bindgen",
"bindgen-cli",
Expand All @@ -7,7 +8,6 @@ members = [
"bindgen-tests/tests/quickchecking",
"bindgen-tests/tests/expectations",
]

default-members = [
"bindgen",
"bindgen-cli",
Expand Down Expand Up @@ -54,4 +54,3 @@ release = false
[profile.dist]
inherits = "release"
lto = "thin"

3 changes: 2 additions & 1 deletion bindgen/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};
use std::rc::Rc;
use std::str::FromStr;
use std::sync::{Arc, OnceLock};

// Some convenient typedefs for a fast hash map and hash set.
type HashMap<K, V> = rustc_hash::FxHashMap<K, V>;
Expand Down Expand Up @@ -576,6 +575,8 @@ impl BindgenOptions {

#[cfg(feature = "runtime")]
fn ensure_libclang_is_loaded() {
use std::sync::{Arc, OnceLock};

if clang_sys::is_loaded() {
return;
}
Expand Down

0 comments on commit 72e85ef

Please sign in to comment.