Skip to content

chore: bump system-configuration to 0.7 #256

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
BugenZhao wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −3
Open

chore: bump system-configuration to 0.7 #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pretty_env_logger = "0.5"
pnet_datalink = "0.35.0"

[target.'cfg(target_os = "macos")'.dependencies]
system-configuration = { version = ">=0.5, <0.7", optional = true }
system-configuration = { version = "0.7", optional = true }

[target.'cfg(windows)'.dependencies]
windows-registry = { version = ">=0.3, <0.7", optional = true }
Expand Down
8 changes: 6 additions & 2 deletions src/client/proxy/matcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ mod builder {
#[cfg(feature = "client-proxy-system")]
#[cfg(target_os = "macos")]
mod mac {
use system_configuration::core_foundation::base::{CFType, TCFType, TCFTypeRef};
use system_configuration::core_foundation::base::CFType;
use system_configuration::core_foundation::dictionary::CFDictionary;
use system_configuration::core_foundation::number::CFNumber;
use system_configuration::core_foundation::string::{CFString, CFStringRef};
Expand All @@ -586,7 +586,11 @@ mod mac {
};

pub(super) fn with_system(builder: &mut super::Builder) {
let store = SCDynamicStoreBuilder::new("").build();
let store = if let Some(store) = SCDynamicStoreBuilder::new("hyper-util").build() {
store
} else {
return;
};

let proxies_map = if let Some(proxies_map) = store.get_proxies() {
proxies_map
Expand Down
Loading