Skip to content

refactor(platform): migrate device mechanics to the neutral facade #1344

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

Merged
zackees merged 1 commit into from
Aug 22, 2026
Merged

refactor(platform): migrate device mechanics to the neutral facade #1344

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.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 0 additions & 38 deletions ci/platform_boundary_ledger.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,47 +45,9 @@ crates/fbuild-deploy/src/rp2040_topology.rs attr_cfg #[cfg(windows)] 1 device ho
crates/fbuild-deploy/src/rp2040_topology.rs native_path std::os::windows::ffi::OsStrExt 0 device host_mechanic
crates/fbuild-library/src/library/library_spec.rs attr_cfg #[cfg(windows)] 0 host host_mechanic
crates/fbuild-paths/src/dev_daemon_namespace.rs native_path std::env::current_exe 0 host_executable host_mechanic
crates/fbuild-serial/Cargo.toml native_dependency windows-sys 0 device host_mechanic
crates/fbuild-serial/Cargo.toml target_dependency_table [target.'cfg(windows)'.dependencies] 0 device host_mechanic
crates/fbuild-serial/src/port_class.rs attr_cfg #[cfg(not(any(target_os=,target_os=,target_os=)))] 0 device host_mechanic
crates/fbuild-serial/src/port_class.rs attr_cfg #[cfg(target_os=)] 0 device host_mechanic
crates/fbuild-serial/src/port_class.rs attr_cfg #[cfg(target_os=)] 1 device host_mechanic
crates/fbuild-serial/src/port_class.rs attr_cfg #[cfg(target_os=)] 2 device host_mechanic
crates/fbuild-serial/src/port_class.rs attr_cfg #[cfg(target_os=)] 3 device host_mechanic
crates/fbuild-serial/src/port_class.rs attr_cfg #[cfg(target_os=)] 4 device host_mechanic
crates/fbuild-serial/src/port_class.rs attr_cfg #[cfg(target_os=)] 5 device host_mechanic
crates/fbuild-serial/src/port_class.rs attr_cfg #[cfg(target_os=)] 6 device host_mechanic
crates/fbuild-serial/src/port_class.rs attr_cfg #[cfg(target_os=)] 7 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(any(windows,test))] 0 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(not(windows))] 0 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(not(windows))] 1 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(not(windows))] 2 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(not(windows))] 3 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(target_os=)] 0 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(target_os=)] 1 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(target_os=)] 2 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(windows)] 0 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(windows)] 1 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(windows)] 2 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(windows)] 3 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg(windows)] 4 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg_attr(not(windows),allow(dead_code))] 0 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg_attr(not(windows),allow(dead_code))] 1 device host_mechanic
crates/fbuild-serial/src/ports.rs attr_cfg #[cfg_attr(not(windows),allow(dead_code))] 2 device host_mechanic
crates/fbuild-serial/src/ports.rs native_path windows_sys:: 0 device host_mechanic
crates/fbuild-serial/src/ports.rs native_path windows_sys:: 1 device host_mechanic
crates/fbuild-serial/src/ports.rs native_path windows_sys:: 2 device host_mechanic
crates/fbuild-serial/src/ports.rs native_path windows_sys:: 3 device host_mechanic
crates/fbuild-serial/src/ports.rs native_path windows_sys:: 4 device host_mechanic
crates/fbuild-serial/src/ports.rs native_path windows_sys:: 5 device host_mechanic
crates/fbuild-serial/src/ports.rs native_path windows_sys:: 6 device host_mechanic
crates/fbuild-serial/src/sysfs_usb.rs attr_cfg #[cfg(target_os=)] 0 device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs attr_cfg #[cfg(not(windows))] 0 device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs attr_cfg #[cfg(windows)] 0 device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs attr_cfg #[cfg(windows)] 1 device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs native_path windows:: 0 device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs native_path windows_sys:: 0 device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs native_path windows_sys:: 1 device host_mechanic
crates/fbuild-toolchain/src/toolchain/esp_qemu.rs attr_cfg #[cfg(not(target_os=))] 0 host_executable host_mechanic
crates/fbuild-toolchain/src/toolchain/esp_qemu.rs attr_cfg #[cfg(not(windows))] 0 host_executable host_mechanic
crates/fbuild-toolchain/src/toolchain/esp_qemu.rs attr_cfg #[cfg(not(windows))] 1 host_executable host_mechanic
Expand Down
70 changes: 22 additions & 48 deletions ci/platform_boundary_research.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ crates/fbuild-config/src/bin/enrich_boards.rs 74 attr_cfg #[cfg(windows)] host h
crates/fbuild-config/src/bin/enrich_boards.rs 78 attr_cfg #[cfg(not(windows))] host host_mechanic
crates/fbuild-core/Cargo.toml 47 native_dependency interprocess ipc host_mechanic
crates/fbuild-core/Cargo.toml 48 native_dependency socket2 ipc host_mechanic
crates/fbuild-core/Cargo.toml 50 target_dependency_table [target.'cfg(unix)'.dependencies] fs host_mechanic
crates/fbuild-core/Cargo.toml 52 native_dependency libc fs host_mechanic
crates/fbuild-core/Cargo.toml 54 target_dependency_table [target.'cfg(windows)'.dependencies] fs host_mechanic
crates/fbuild-core/Cargo.toml 57 native_dependency windows-sys fs host_mechanic
crates/fbuild-core/Cargo.toml 54 target_dependency_table [target.'cfg(unix)'.dependencies] fs host_mechanic
crates/fbuild-core/Cargo.toml 56 native_dependency libc fs host_mechanic
crates/fbuild-core/Cargo.toml 58 target_dependency_table [target.'cfg(windows)'.dependencies] fs host_mechanic
crates/fbuild-core/Cargo.toml 64 native_dependency windows-sys fs host_mechanic
crates/fbuild-core/src/platform/executable.rs 56 native_path std::env::current_exe host_executable host_mechanic
crates/fbuild-core/src/platform/linux/fs.rs 2 native_path std::os::unix::fs::PermissionsExt fs host_mechanic
crates/fbuild-core/src/platform/linux/fs.rs 40 native_path std::os::unix::fs::symlink fs host_mechanic
Expand All @@ -37,7 +37,7 @@ crates/fbuild-core/src/platform/linux/ipc.rs 2 native_path interprocess::local_s
crates/fbuild-core/src/platform/linux/ipc.rs 3 native_path interprocess::os::unix ipc host_mechanic
crates/fbuild-core/src/platform/linux/ipc.rs 4 native_path socket2:: ipc host_mechanic
crates/fbuild-core/src/platform/linux/ipc.rs 66 native_path std::os::unix::fs::PermissionsExt ipc host_mechanic
crates/fbuild-core/src/platform/linux/mod.rs 10 compile_host_fact std::env::consts::ARCH host host_mechanic
crates/fbuild-core/src/platform/linux/mod.rs 12 compile_host_fact std::env::consts::ARCH host host_mechanic
crates/fbuild-core/src/platform/linux/process.rs 1 native_path std::os::unix::process::ExitStatusExt process host_mechanic
crates/fbuild-core/src/platform/macos/fs.rs 2 native_path std::os::unix::fs::PermissionsExt fs host_mechanic
crates/fbuild-core/src/platform/macos/fs.rs 40 native_path std::os::unix::fs::symlink fs host_mechanic
Expand All @@ -50,8 +50,13 @@ crates/fbuild-core/src/platform/macos/ipc.rs 2 native_path interprocess::local_s
crates/fbuild-core/src/platform/macos/ipc.rs 3 native_path socket2:: ipc host_mechanic
crates/fbuild-core/src/platform/macos/ipc.rs 19 native_path std::os::unix::fs::PermissionsExt ipc host_mechanic
crates/fbuild-core/src/platform/macos/ipc.rs 72 native_path std::os::unix::fs::PermissionsExt ipc host_mechanic
crates/fbuild-core/src/platform/macos/mod.rs 10 compile_host_fact std::env::consts::ARCH host host_mechanic
crates/fbuild-core/src/platform/macos/mod.rs 12 compile_host_fact std::env::consts::ARCH host host_mechanic
crates/fbuild-core/src/platform/macos/process.rs 1 native_path std::os::unix::process::ExitStatusExt process host_mechanic
crates/fbuild-core/src/platform/windows/device.rs 18 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/device.rs 26 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/device.rs 29 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/device.rs 30 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/device.rs 34 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/fs.rs 2 native_path std::os::windows::ffi::OsStrExt process host_mechanic
crates/fbuild-core/src/platform/windows/fs.rs 3 native_path std::os::windows::fs fs host_mechanic
crates/fbuild-core/src/platform/windows/fs.rs 4 native_path std::os::windows::io::AsRawHandle process host_mechanic
Expand All @@ -65,8 +70,15 @@ crates/fbuild-core/src/platform/windows/ipc.rs 3 native_path interprocess::os::w
crates/fbuild-core/src/platform/windows/ipc.rs 4 native_path interprocess::os::windows ipc host_mechanic
crates/fbuild-core/src/platform/windows/ipc.rs 5 native_path socket2:: ipc host_mechanic
crates/fbuild-core/src/platform/windows/ipc.rs 6 native_path std::os::windows::io::AsRawSocket ipc host_mechanic
crates/fbuild-core/src/platform/windows/mod.rs 10 compile_host_fact std::env::consts::ARCH host host_mechanic
crates/fbuild-core/src/platform/windows/mod.rs 12 compile_host_fact std::env::consts::ARCH host host_mechanic
crates/fbuild-core/src/platform/windows/process.rs 1 native_path std::os::windows::io::AsHandle process host_mechanic
crates/fbuild-core/src/platform/windows/usb_pnp.rs 13 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/usb_pnp.rs 24 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/usb_pnp.rs 28 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/usb_pnp.rs 32 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/usb_pnp.rs 35 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/usb_pnp.rs 39 native_path windows_sys:: process host_mechanic
crates/fbuild-core/src/platform/windows/usb_pnp.rs 40 native_path windows_sys:: process host_mechanic
crates/fbuild-daemon/src/handlers/emulator/tests_npm_cache.rs 146 attr_cfg #[cfg(windows)] host_executable host_artifact_policy
crates/fbuild-daemon/src/handlers/emulator/tests_process.rs 9 attr_cfg #[cfg(windows)] host_executable host_artifact_policy
crates/fbuild-daemon/src/handlers/emulator/tests_process.rs 21 attr_cfg #[cfg(not(windows))] host_executable host_artifact_policy
Expand All @@ -93,47 +105,9 @@ crates/fbuild-deploy/src/rp2040_topology.rs 123 native_path std::os::windows::ff
crates/fbuild-deploy/src/rp2040_topology.rs 506 attr_cfg #[cfg(not(windows))] device host_mechanic
crates/fbuild-library/src/library/library_spec.rs 266 attr_cfg #[cfg(windows)] host host_mechanic
crates/fbuild-paths/src/dev_daemon_namespace.rs 83 native_path std::env::current_exe host_executable host_mechanic
crates/fbuild-serial/Cargo.toml 32 target_dependency_table [target.'cfg(windows)'.dependencies] device host_mechanic
crates/fbuild-serial/Cargo.toml 33 native_dependency windows-sys device host_mechanic
crates/fbuild-serial/src/port_class.rs 105 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/port_class.rs 109 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/port_class.rs 113 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/port_class.rs 122 attr_cfg #[cfg(not(any(target_os=,target_os=,target_os=)))] device host_mechanic
crates/fbuild-serial/src/port_class.rs 129 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/port_class.rs 224 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/port_class.rs 281 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/port_class.rs 419 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/port_class.rs 495 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/ports.rs 129 attr_cfg #[cfg_attr(not(windows),allow(dead_code))] device host_mechanic
crates/fbuild-serial/src/ports.rs 137 attr_cfg #[cfg_attr(not(windows),allow(dead_code))] device host_mechanic
crates/fbuild-serial/src/ports.rs 159 attr_cfg #[cfg_attr(not(windows),allow(dead_code))] device host_mechanic
crates/fbuild-serial/src/ports.rs 182 attr_cfg #[cfg(windows)] device host_mechanic
crates/fbuild-serial/src/ports.rs 186 attr_cfg #[cfg(not(windows))] device host_mechanic
crates/fbuild-serial/src/ports.rs 195 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/ports.rs 208 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/ports.rs 270 attr_cfg #[cfg(any(windows,test))] device host_mechanic
crates/fbuild-serial/src/ports.rs 281 attr_cfg #[cfg(windows)] device host_mechanic
crates/fbuild-serial/src/ports.rs 285 attr_cfg #[cfg(not(windows))] device host_mechanic
crates/fbuild-serial/src/ports.rs 299 attr_cfg #[cfg(windows)] device host_mechanic
crates/fbuild-serial/src/ports.rs 303 attr_cfg #[cfg(not(windows))] device host_mechanic
crates/fbuild-serial/src/ports.rs 326 attr_cfg #[cfg(windows)] device host_mechanic
crates/fbuild-serial/src/ports.rs 330 attr_cfg #[cfg(not(windows))] device host_mechanic
crates/fbuild-serial/src/ports.rs 341 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/ports.rs 471 attr_cfg #[cfg(windows)] device host_mechanic
crates/fbuild-serial/src/ports.rs 482 native_path windows_sys:: device host_mechanic
crates/fbuild-serial/src/ports.rs 492 native_path windows_sys:: device host_mechanic
crates/fbuild-serial/src/ports.rs 495 native_path windows_sys:: device host_mechanic
crates/fbuild-serial/src/ports.rs 499 native_path windows_sys:: device host_mechanic
crates/fbuild-serial/src/ports.rs 502 native_path windows_sys:: device host_mechanic
crates/fbuild-serial/src/ports.rs 507 native_path windows_sys:: device host_mechanic
crates/fbuild-serial/src/ports.rs 511 native_path windows_sys:: device host_mechanic
crates/fbuild-serial/src/sysfs_usb.rs 461 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs 258 attr_cfg #[cfg(windows)] device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs 260 native_path windows:: device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs 263 attr_cfg #[cfg(not(windows))] device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs 278 attr_cfg #[cfg(windows)] device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs 282 native_path windows_sys:: device host_mechanic
crates/fbuild-serial/src/usb_recovery.rs 288 native_path windows_sys:: device host_mechanic
crates/fbuild-serial/src/ports.rs 222 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/ports.rs 234 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-serial/src/ports.rs 291 attr_cfg #[cfg(target_os=)] device host_mechanic
crates/fbuild-toolchain/src/toolchain/esp_qemu.rs 220 attr_cfg #[cfg(not(target_os=))] host_executable host_mechanic
crates/fbuild-toolchain/src/toolchain/esp_qemu.rs 226 attr_cfg #[cfg(target_os=)] host_executable host_mechanic
crates/fbuild-toolchain/src/toolchain/esp_qemu.rs 576 attr_cfg #[cfg(windows)] host_executable host_mechanic
Expand Down
2 changes: 1 addition & 1 deletion ci/test_enforce_platform_boundary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def setUpClass(cls) -> None:
cls.observed = boundary.rows_from_findings(boundary.research.inventory())

def test_committed_exact_occurrence_ledger_matches_whole_tree(self) -> None:
self.assertEqual(len(self.expected), 95)
self.assertEqual(len(self.expected), 57)
self.assertFalse(boundary.validate_ledger(self.expected))
self.assertFalse(boundary.compare(self.expected, self.observed))

Expand Down
18 changes: 17 additions & 1 deletion crates/fbuild-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ same-file = { workspace = true }
# to the selected `platform::ipc` implementations.
interprocess = { workspace = true }
socket2 = { workspace = true }
# Portable serial-port enumeration delegate for `platform::device` on Unix
# hosts, plus the `SerialPortInfo` shape the neutral facts map from. The
# Windows SetupAPI fork does not use it. FastLED/fbuild#1313.
serialport = { workspace = true }

[target.'cfg(unix)'.dependencies]
# Selected Unix filesystem mechanics query the exact mount containing a path.
Expand All @@ -54,7 +58,19 @@ libc = { workspace = true }
[target.'cfg(windows)'.dependencies]
# Selected Windows filesystem mechanics: removable-volume facts and retiring
# a kernel-blocked output handle after its watchdog expires.
windows-sys = { version = "0.52", features = ["Win32_Foundation", "Win32_Storage_FileSystem", "Win32_System_IO"] }
# The Devices_* / Registry / Security features serve `platform::device`:
# the SetupAPI serial enumeration fork, CfgMgr32 PnP recovery primitives,
# and the WinUsb BOOTSEL reset (FastLED/fbuild#962, #1152, #1313).
windows-sys = { version = "0.52", features = [
"Win32_Devices_DeviceAndDriverInstallation",
"Win32_Devices_Properties",
"Win32_Devices_Usb",
"Win32_Foundation",
"Win32_Security",
"Win32_Storage_FileSystem",
"Win32_System_IO",
"Win32_System_Registry",
] }
# Selected Windows IPC creates a protected owner-only pipe descriptor.
widestring = { workspace = true }

Expand Down
Loading
Loading