diff options
| -rw-r--r-- | crates/arti-client/src/rpc.rs | 2 | ||||
| -rw-r--r-- | crates/arti-rpc-client-core/src/conn/connimpl.rs | 2 | ||||
| -rw-r--r-- | crates/arti/src/socks.rs | 2 | ||||
| -rw-r--r-- | crates/tor-cell/src/relaycell/hs/pow.rs | 2 | ||||
| -rw-r--r-- | crates/tor-chanmgr/src/mgr/select.rs | 2 | ||||
| -rw-r--r-- | crates/tor-keymgr/src/config.rs | 2 | ||||
| -rw-r--r-- | crates/tor-keymgr/src/keystore/ctor/client.rs | 2 | ||||
| -rw-r--r-- | crates/tor-keymgr/src/keystore/ephemeral.rs | 2 | ||||
| -rw-r--r-- | crates/tor-keymgr/src/mgr.rs | 2 | ||||
| -rw-r--r-- | crates/tor-memquota/src/lib.rs | 2 | ||||
| -rw-r--r-- | crates/tor-netdoc/src/doc/hsdesc/pow.rs | 2 | ||||
| -rw-r--r-- | crates/tor-proto/src/util/oneshot_broadcast.rs | 2 | ||||
| -rw-r--r-- | crates/tor-rpc-connect/src/load.rs | 2 | ||||
| -rw-r--r-- | crates/tor-rtcompat/src/coarse_time.rs | 2 | ||||
| -rw-r--r-- | crates/tor-rtmock/src/task.rs | 4 | ||||
| -rw-r--r-- | crates/tor-socksproto/src/handshake/framework.rs | 4 | ||||
| -rw-r--r-- | doc/dev/notes/cell-lifecycle.md | 2 | ||||
| -rw-r--r-- | doc/dev/notes/service-side-pow.md | 2 | ||||
| -rw-r--r-- | doc/dev/rpc-book/src/rpc-connect-sketch.md | 10 | ||||
| -rwxr-xr-x | maint/rpc-docs-tool | 4 | ||||
| -rw-r--r-- | python/arti_rpc/src/arti_rpc/rpc.py | 4 |
21 files changed, 29 insertions, 29 deletions
diff --git a/crates/arti-client/src/rpc.rs b/crates/arti-client/src/rpc.rs index 3ba311d2f..30b6dc310 100644 --- a/crates/arti-client/src/rpc.rs +++ b/crates/arti-client/src/rpc.rs @@ -131,7 +131,7 @@ async fn watch_client_status<R: Runtime>( /// Returned ObjectID is a handle for a new `TorClient`, /// which is isolated from other `TorClients`: /// any streams created with the new `TorClient` will not share circuits -/// with streams crated with any other `TorClient`. +/// with streams created with any other `TorClient`. #[derive(Deftly, Debug, Serialize, Deserialize)] #[derive_deftly(rpc::DynMethod)] #[deftly(rpc(method_name = "arti:new_isolated_client"))] diff --git a/crates/arti-rpc-client-core/src/conn/connimpl.rs b/crates/arti-rpc-client-core/src/conn/connimpl.rs index e5f45ac4b..025318b25 100644 --- a/crates/arti-rpc-client-core/src/conn/connimpl.rs +++ b/crates/arti-rpc-client-core/src/conn/connimpl.rs @@ -269,7 +269,7 @@ impl Receiver { ) -> Result<ValidatedResponse, ProtoError> { // Here in wait_on_message_for_impl, we do the the actual work // of waiting for the message. - let state = self.state.lock().expect("posioned"); + let state = self.state.lock().expect("poisoned"); let (result, mut state, should_alert) = self.wait_on_message_for_impl(state, id); // Great; we have a message or a fatal error. All we need to do now diff --git a/crates/arti/src/socks.rs b/crates/arti/src/socks.rs index 05c832cde..3b2527419 100644 --- a/crates/arti/src/socks.rs +++ b/crates/arti/src/socks.rs @@ -326,7 +326,7 @@ fn interpret_socks_auth(auth: &SocksAuth) -> Result<AuthInterpretation> { return Ok(Uname::Legacy); }; if remainder.is_empty() { - return Err(anyhow!("Exteneded SOCKS information without format code.")); + return Err(anyhow!("Extended SOCKS information without format code.")); } // TODO MSRV 1.80: use split_at_checked instead. // This won't panic since we checked for an empty string above. diff --git a/crates/tor-cell/src/relaycell/hs/pow.rs b/crates/tor-cell/src/relaycell/hs/pow.rs index abf863861..9234be6b7 100644 --- a/crates/tor-cell/src/relaycell/hs/pow.rs +++ b/crates/tor-cell/src/relaycell/hs/pow.rs @@ -9,7 +9,7 @@ use super::intro_payload::IntroPayloadExtType; use caret::caret_int; use tor_bytes::{EncodeResult, Reader, Result, Writer}; -/// Extention to provide a proof of work for denial of service mitigation +/// Extension to provide a proof of work for denial of service mitigation /// /// Documented at <https://spec.torproject.org/rend-spec/introduction-protocol.html#INTRO1_POW_EXT> /// diff --git a/crates/tor-chanmgr/src/mgr/select.rs b/crates/tor-chanmgr/src/mgr/select.rs index 517f19a01..4a4562f9b 100644 --- a/crates/tor-chanmgr/src/mgr/select.rs +++ b/crates/tor-chanmgr/src/mgr/select.rs @@ -401,7 +401,7 @@ mod test { #[test] fn best_channel_many() { - // some misc channels (as we make `choose_best_channel` more complex, hopefull we can add + // some misc channels (as we make `choose_best_channel` more complex, hopeful we can add // more channels here) let channels = [ ChannelState::Open(open_channel(FakeChannel { diff --git a/crates/tor-keymgr/src/config.rs b/crates/tor-keymgr/src/config.rs index 0c210fc8b..9b0485560 100644 --- a/crates/tor-keymgr/src/config.rs +++ b/crates/tor-keymgr/src/config.rs @@ -331,7 +331,7 @@ impl ArtiKeystoreConfigBuilder { } let () = match self.primary.kind { - // only enabled OR kind may be set, and when keymgr is not enabeld they must be false|disabled + // only enabled OR kind may be set, and when keymgr is not enabled they must be false|disabled None | Some(EoA::Auto) => Ok(()), _ => Err(ConfigBuildError::Inconsistent { fields: ["enabled", "kind"].map(Into::into).into_iter().collect(), diff --git a/crates/tor-keymgr/src/keystore/ctor/client.rs b/crates/tor-keymgr/src/keystore/ctor/client.rs index 6536c906d..d85f44c44 100644 --- a/crates/tor-keymgr/src/keystore/ctor/client.rs +++ b/crates/tor-keymgr/src/keystore/ctor/client.rs @@ -193,7 +193,7 @@ impl CTorClientKeystore { /// format. /// /// TODO: we might want to move this to tor-hscrypto at some point, -/// but for now, we don't actually *need* to expose this publically. +/// but for now, we don't actually *need* to expose this publicly. fn parse_client_keypair( key: impl AsRef<str>, ) -> StdResult<(HsId, HsClientDescEncKeypair), MalformedClientKeyError> { diff --git a/crates/tor-keymgr/src/keystore/ephemeral.rs b/crates/tor-keymgr/src/keystore/ephemeral.rs index 713003138..6b20cc69a 100644 --- a/crates/tor-keymgr/src/keystore/ephemeral.rs +++ b/crates/tor-keymgr/src/keystore/ephemeral.rs @@ -25,7 +25,7 @@ type KeyIdent = (ArtiPath, KeystoreItemType); /// system may do so for reasons outside of this library's control. Some /// examples are swapping RAM to disk, generating core dumps, invoking /// suspend-to-disk power management, etc. This key store does not attempt to -/// prevent this operating system behvaiour. +/// prevent this operating system behaviour. pub struct ArtiEphemeralKeystore { /// Identifier hard-coded to 'ephemeral' id: KeystoreId, diff --git a/crates/tor-keymgr/src/mgr.rs b/crates/tor-keymgr/src/mgr.rs index c68b4ab35..e2ac48c34 100644 --- a/crates/tor-keymgr/src/mgr.rs +++ b/crates/tor-keymgr/src/mgr.rs @@ -687,7 +687,7 @@ mod tests { /// The corresponding fake public key type. #[derive(Clone, Debug)] struct TestPublicKey { - /// The undelying key. + /// The underlying key. key: KeystoreItem, } diff --git a/crates/tor-memquota/src/lib.rs b/crates/tor-memquota/src/lib.rs index 0792917db..8226d9672 100644 --- a/crates/tor-memquota/src/lib.rs +++ b/crates/tor-memquota/src/lib.rs @@ -167,7 +167,7 @@ //! //! In the case of sufficiently bad account errors, //! a Participant, or a whole Account, or the whole MemoryQuotaTracker, -//! may become unuseable, +//! may become unusable, //! in which case methods will return errors with kind [`tor_error::ErrorKind::Internal`]. // // TODO MEMQUOTA: We ought to account for the fixed overhead of each stream, circuit, and diff --git a/crates/tor-netdoc/src/doc/hsdesc/pow.rs b/crates/tor-netdoc/src/doc/hsdesc/pow.rs index 2526db749..4228910f9 100644 --- a/crates/tor-netdoc/src/doc/hsdesc/pow.rs +++ b/crates/tor-netdoc/src/doc/hsdesc/pow.rs @@ -27,7 +27,7 @@ impl PowParamSet { /// pub(super) fn from_items(items: &[Item<'_, HsInnerKwd>]) -> Result<Self> { // Parse each one individually, - // verifing each time we don't have a duplicated enum discriminant. + // verifying each time we don't have a duplicated enum discriminant. let mut inner = Vec::new(); let mut schemes_seen: HashSet<Discriminant<PowParams>> = HashSet::new(); for item in items { diff --git a/crates/tor-proto/src/util/oneshot_broadcast.rs b/crates/tor-proto/src/util/oneshot_broadcast.rs index 0ccf935e1..ff1e6c083 100644 --- a/crates/tor-proto/src/util/oneshot_broadcast.rs +++ b/crates/tor-proto/src/util/oneshot_broadcast.rs @@ -68,7 +68,7 @@ pub(crate) struct Receiver<T> { /// /// When the wakers Mutex is released at (C), a release-store operation is performed by the Mutex, /// which means that the message set at (A) will be seen by all future acquire-load operations by -/// that same Mutex. More specifically, after (C) has occured and when the same mutex is acquired at +/// that same Mutex. More specifically, after (C) has occurred and when the same mutex is acquired at /// (D), the message set at (A) is guaranteed to be visible at (E). This means that after the wakers /// are taken at (B), no future wakers will be added at (F) and no waker will be "lost". #[derive(Debug)] diff --git a/crates/tor-rpc-connect/src/load.rs b/crates/tor-rpc-connect/src/load.rs index a7aa991bd..39411959c 100644 --- a/crates/tor-rpc-connect/src/load.rs +++ b/crates/tor-rpc-connect/src/load.rs @@ -159,7 +159,7 @@ pub struct LoadOptions { #[derive(Clone, Debug, thiserror::Error)] #[non_exhaustive] pub enum LoadError { - /// We couldn't accesss the path. + /// We couldn't access the path. /// /// This can happen if permissions are wrong, /// the file doesn't exist, we encounter an IO error, or something similar. diff --git a/crates/tor-rtcompat/src/coarse_time.rs b/crates/tor-rtcompat/src/coarse_time.rs index 6cb9c0f63..d7a59f281 100644 --- a/crates/tor-rtcompat/src/coarse_time.rs +++ b/crates/tor-rtcompat/src/coarse_time.rs @@ -161,7 +161,7 @@ impl CoarseTimeProvider for RealCoarseTimeProvider { } } -#[cfg(not(miri))] // TODO coarse_time substracts with overflow! +#[cfg(not(miri))] // TODO coarse_time subtracts with overflow! #[cfg(test)] mod test { // @@ begin test lint list maintained by maint/add_warning @@ diff --git a/crates/tor-rtmock/src/task.rs b/crates/tor-rtmock/src/task.rs index 775b48661..adbd6a36c 100644 --- a/crates/tor-rtmock/src/task.rs +++ b/crates/tor-rtmock/src/task.rs @@ -194,9 +194,9 @@ enum TaskState { struct ActualWaker { /// Executor state /// - /// The Waker musn't to hold a strong reference to the executor, + /// The Waker mustn't to hold a strong reference to the executor, /// since typically a task holds a future that holds a Waker, - /// and the exeuctor holds the task - so that would be a cycle. + /// and the executor holds the task - so that would be a cycle. data: Weak<Mutex<Data>>, /// Which task this is diff --git a/crates/tor-socksproto/src/handshake/framework.rs b/crates/tor-socksproto/src/handshake/framework.rs index daa749e1c..ad458a43b 100644 --- a/crates/tor-socksproto/src/handshake/framework.rs +++ b/crates/tor-socksproto/src/handshake/framework.rs @@ -196,11 +196,11 @@ impl<'b, O, P: ReadPrecision> Finished<'b, O, P> { /// Return the output, and the following already-read data as a `Vec` /// - /// The `Vec` is quite likely to have a considerably larger capacity than contnets. + /// The `Vec` is quite likely to have a considerably larger capacity than contents. /// (Its capacity is usually the original buffer size, when the `Buffer` was created.) /// /// The `Buffer` should not be discarded after calling this; - /// it will not be useable. + /// it will not be usable. // // Ideally, this would *consume* the Buffer. But that would mean that // `step` would have to take and return the buffer, diff --git a/doc/dev/notes/cell-lifecycle.md b/doc/dev/notes/cell-lifecycle.md index 88ce0b880..6b96c5c88 100644 --- a/doc/dev/notes/cell-lifecycle.md +++ b/doc/dev/notes/cell-lifecycle.md @@ -294,7 +294,7 @@ We continue reading from the stream, but we stop writing to it. 7. But reading from `input` means having to respond to the received cell, e.g. by sending a circuit-level SENDME. The other end won't receive our "response" though, - because our "response" cells will get queueud + because our "response" cells will get queued until our KIST Socket says it's ok to write some more However, when KIST-limiting kicks in, we don't expect to actually receive diff --git a/doc/dev/notes/service-side-pow.md b/doc/dev/notes/service-side-pow.md index 68850511c..9c154476d 100644 --- a/doc/dev/notes/service-side-pow.md +++ b/doc/dev/notes/service-side-pow.md @@ -20,7 +20,7 @@ Related spec docs: * Used nonces datastructure * Verifier for the correct seed (implies that access to the verifier should be keyed on `SeedHead` since that's all we have access to when processing a request, we don't know the TP) - * Total effort value, which must somehow be updated upon successful requets + * Total effort value, which must somehow be updated upon successful requests * At some point after we have verified the solve, the code dequeuing requests in order to send them to the backend that generates responses needs to be able to see the effort associated with that request. diff --git a/doc/dev/rpc-book/src/rpc-connect-sketch.md b/doc/dev/rpc-book/src/rpc-connect-sketch.md index 837f0ad56..c0e988271 100644 --- a/doc/dev/rpc-book/src/rpc-connect-sketch.md +++ b/doc/dev/rpc-book/src/rpc-connect-sketch.md @@ -158,7 +158,7 @@ Thus we are able to guarantee: - All path-separating characters (`;` on windows, `:` elsewhere) *must* be escaped when URL-encoding. (RPC client implementations *must* operate by first splitting the - string on the path-seprating character, and then by decoding + string on the path-separating character, and then by decoding the individual entries.) The default search path is: @@ -360,9 +360,9 @@ or if it is a relative `unix:` path, then the connection attempt is *declined*. -Currently recognized `auth` memebers are in one of these forms: +Currently recognized `auth` members are in one of these forms: - The string `"none"`. - - A TCP coookie authentication object. + - A TCP cookie authentication object. Each is explained below. If the `auth` member is in some other unsupported format, the connection attempt is *declined*. @@ -703,7 +703,7 @@ to supply RPC connect points. > since (per the Android security model) > those other apps MUST NOT completely trust the Tor provider app. > -> Allowing the Tor servce to supply the connect point +> Allowing the Tor service to supply the connect point > might allow the Tor service to completely take over the client app. > While the Tor service can inevitably, by its nature, > subvert client apps' use of Tor, @@ -718,7 +718,7 @@ to supply RPC connect points. How do applications behave if they want to spin up an owned copy of Arti? (That is, one that exits when they exit.) -Is that a special API for that?) +Is that a special API for that? What does the cookie authentication look like? (See [arti#1521] for one sketch.) diff --git a/maint/rpc-docs-tool b/maint/rpc-docs-tool index 9f24883e1..dfb310176 100755 --- a/maint/rpc-docs-tool +++ b/maint/rpc-docs-tool @@ -6,7 +6,7 @@ Script to generate a document about Arti RPC objects and methods. - Extracts a list of methods and objects by running Arti RPC. - Extracts markdown documentation by running nightly rustdoc to get JSON output. -- Outpus markdown or html. +- Outputs markdown or html. Requires rustdoc nightly, for json support. May require specific versions of rustdoc nightly, @@ -343,7 +343,7 @@ class RpcUniverse: return s def output_types(self): - """Reutrn a set of every known type that can be output from an RPC method""" + """Return a set of every known type that can be output from an RPC method""" return set(minfo["output_type"] for minfo in self.methods.values()) def update_types(self): diff --git a/python/arti_rpc/src/arti_rpc/rpc.py b/python/arti_rpc/src/arti_rpc/rpc.py index 47f1bc4e1..386fdf8ee 100644 --- a/python/arti_rpc/src/arti_rpc/rpc.py +++ b/python/arti_rpc/src/arti_rpc/rpc.py @@ -105,7 +105,7 @@ def _into_json_str(o: Union[str, dict]) -> str: class _BuildEntType(Enum): """ - Value to indiate the kind of an RPC connect point search path entry. + Value to indicate the kind of an RPC connect point search path entry. Returned by ArtiRpcResponse.kind(). """ @@ -571,7 +571,7 @@ class ArtiRpcObject(_RpcBase): class ArtiRpcResponseKind(Enum): """ - Value to indiate the type of a response to an RPC request. + Value to indicate the type of a response to an RPC request. Returned by ArtiRpcResponse.kind(). """ |