From 65766e9b41d743a50279792538c19108785bdb98 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Tue, 8 Sep 2026 11:31:47 +0800
Subject: [PATCH] one `use` per crate, and write the rule down

`fs.rs` came out of the move with two ungated `use hbb_common::` statements,
because the original single `use crate::{...}` had to give up `message_proto`
to the new crate and the rest was left in a second block. Fold it back into one.

A scan of the whole tree for the same shape finds nothing else: every other file
with more than one top-level `use base::` or `use hbb_common::` is split by a
`#[cfg]` that does not cover the whole block, or by `pub use` next to `use`.
Those are the cases that cannot merge, so AGENTS.md now states both the rule and
the exemption.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EZ49AbZJYfm8NTp5yDPMab
---
 AGENTS.md           | 28 ++++++++++++++++++++++++++++
 libs/base/src/fs.rs |  4 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/AGENTS.md b/AGENTS.md
index d43fe5258..1226c40c8 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -67,6 +67,34 @@ workspace member. `base::config::keys` re-exports the handful of keys
 * Do not make formatting-only changes.
 * Keep naming/style consistent with nearby code.
 
+### Imports
+
+* One `use` per crate. Everything a file takes from the same crate goes in a
+  single braced block, not one statement per item:
+
+  ```rust
+  // no
+  use base::fs;
+  use base::message_proto::*;
+
+  // yes
+  use base::{fs, message_proto::*};
+  ```
+
+* The only reason to split is a `#[cfg(...)]` that does not apply to the whole
+  block -- an attribute binds to one item, so a differently-gated import has to
+  stand on its own. A `pub use` re-export likewise cannot join a plain `use`.
+
+  ```rust
+  #[cfg(not(feature = "flutter"))]
+  use base::fs;
+  use base::message_proto::*;
+  ```
+
+* When splitting an existing `use` because some of its items moved to another
+  crate, fold each side into that crate's existing block rather than leaving a
+  second statement behind.
+
 ### Comments
 
 * Avoid comments unless they explain a non-obvious reason, constraint, or workaround.
diff --git a/libs/base/src/fs.rs b/libs/base/src/fs.rs
index 6c9f5c4a4..96f377200 100644
--- a/libs/base/src/fs.rs
+++ b/libs/base/src/fs.rs
@@ -16,11 +16,13 @@ use tokio::{
 };
 
 use crate::message_proto::*;
-use hbb_common::{anyhow::anyhow, bail, get_version_number, ResultType, Stream};
 // https://doc.rust-lang.org/std/os/windows/fs/trait.MetadataExt.html
 use hbb_common::{
+    anyhow::anyhow,
+    bail,
     compress::{compress, decompress},
     config::Config,
+    get_version_number, ResultType, Stream,
 };
 
 static NEXT_JOB_ID: AtomicI32 = AtomicI32::new(1);