Compare commits

...

2 commits

Author SHA1 Message Date
Skye 381df2e644 Move generated submodules into a subdir
This will avoid possibility of them colliding with generated.rs
2023-12-16 17:57:36 -05:00
Skye 2c766e917d Reformat network_manager 2023-12-16 17:56:44 -05:00
2 changed files with 6 additions and 4 deletions

View file

@ -37,6 +37,7 @@ fn main() {
let dbus_paths_raw =
env::var("DBUS_XML_PATH").unwrap_or("/usr/share/dbus-1/interfaces".to_string());
fs::create_dir_all(out_dir.join("generated")).unwrap();
dbus_paths_raw
.split(':')
.map(fs::read_dir)
@ -64,7 +65,7 @@ fn main() {
.strip_suffix(".xml")
.unwrap()
.replace('.', "_");
let out_path = out_dir.join(module_name.clone() + ".rs");
let out_path = out_dir.join(format!("generated/{module_name}.rs"));
fs::File::create(out_path)
.unwrap()
.write_all(code.as_bytes())
@ -74,7 +75,7 @@ fn main() {
.write_all(
format!(
r#"mod {module_name} {{
include!(concat!(env!("OUT_DIR"), "/{module_name}.rs"));
include!(concat!(env!("OUT_DIR"), "/generated/{module_name}.rs"));
}}
pub use {module_name}::*;
"#

View file

@ -14,13 +14,14 @@ pub async fn network_manager(
_output: OutputChannel,
dbus_conn: Arc<SyncConnection>,
) -> eyre::Result<Infallible> {
let destination = "org.freedesktop.NetworkManager";
let timeout = Duration::from_secs(5);
let connection = dbus_conn.as_ref();
let make_proxy = |path| Proxy::new(destination, path, timeout, connection);
let primary_connection = make_proxy("/org/freedesktop/NetworkManager".into()).primary_connection().await?;
let primary_connection = make_proxy("/org/freedesktop/NetworkManager".into())
.primary_connection()
.await?;
let specific_object = make_proxy(primary_connection).specific_object().await?;
let ssid = make_proxy(specific_object).ssid().await?;