mirrors/arti.git/crates/tor-proto/src/tunnel.rs, branch main

proto: Rename uniq_id to circ_unique_id mostly in logging

2026-08-03T18:27:50Z

We have decided that instead of "uniq_id" in logging, we'll use the "-[]-id" syntax to indicate who is that unique ID. This commit only renames circuit's unique ID to "circ_uniq_id". Signed-off-by: David Goulet

proto: Rename CircId and UniqId variable name

2026-08-03T18:25:23Z

A CircId is now a circ_id and a UniqId is a unique_id so we stop confusing them in the code. Furthermore, channel_id that are CircId are now circ_id. Channel IDs are different and encoded internally into a UniqId. This is the first step to clarify semantic before we change the logging to log both unique ID and circ ID. No behavior change. Signed-off-by: David Goulet

Tweak Display for TunnelScopedCircId

2026-04-09T17:06:09Z

Circuit IDs (UniqId) are displayed as "Circ .". Prior to this MR, these TunnelScopedCircId's were displayed as "Circ .." where t is the integer tunnel ID. This made corresponding logs a bit confusing as to why some "Circ" identifiers had two parts and some have three, and didn't make clear that the "." part of the latter were comparable with the two-part UniqIds. The previous commit effectively changes the latter to "Circ Tunnel ..", which is still a bit confusing. This commit changes the display of TunnelScopedCircId's to "Circ . (Tunnel )", which makes the distinction between the circuit and tunnel IDs clearer.

Tunnel ID: included "Tunnel" type-specifier in Display

2026-04-09T17:02:51Z

This is akin to how circuit `UniqId`'s are prefixed with "Circ", and helps clarify logs where it isn't always clear from context whether a tunnel ID or circuit ID is being displayed.

proto: Move TunnelId to a separate, shared module.

2025-08-28T10:54:48Z

The `TunnelId*` types will be reused in the relay reactor (exit relays need to have the concept of a "tunnel ID" because of conflux). Now the `relay::reactor` module only has a single import from `client` (for the `unwrap_or_shutdown` helper, which we should be able to remove soon). From now, we will avoid importing anything from `client` in the `relay` module, and instead prefer refactoring the code as needed (to pull the implementation-agnostic parts outside of `client`). This commit has no functional changes, just code motion.

proto: Rename the `tunnel` module to `client`.

2025-08-18T16:09:04Z

The implementation from `tunnel` is client-specific, so we are renaming the module accordingly. The more generic parts will be pulled into a separate module in a future commit.

proto: Add a ChannelProvider trait.

2025-08-18T11:14:35Z

Part of #1447

Fix warnings and errors from edition 2024.

2025-08-07T15:28:39Z

The two main causes of errors were: - Since some of the lifetime rules have changed, we no longer need to do as many "bind a variable and immediately return it" patterns, and so clippy now warns about them. - We needed to adjust the explicit captures (`use<...>`) in a couple of our RPIT instances.

Switch Cargo.toml files to edition 2024.

2025-08-07T15:28:36Z

First, run ``` git grep -l "^edition =" | xargs perl -i -pe 's/^edition *=.*/edition = "2024"/;' ``` Second, manually verify that all Cargo.toml files have changed, and nothing else has changed. Third, run cargo fmt again.

Update code for Edition 2024

2025-08-07T15:28:31Z

1. Run cargo fix --edition 2. Selectively revert the "if let"->"match" changes. These changes are meant to protect us from the lifetime changes for "if let" bindings in Rust 2024. But we're not actually relying on the old lifetime rules anywhere, and the match syntax here is quite ugly. 3. Automatically revert `$pat:expr_2021` to `$pat:expr`. (We don't actually want to restrict the expression syntax that our macros accept). Done with `git grep -l expr_2021 | xargs perl -i -pe 's/expr_2021/expr/g;'` 4. Run cargo fmt.