diff options
37 files changed, 53 insertions, 53 deletions
diff --git a/crates/arti-client/examples/one_hop_circuit.rs b/crates/arti-client/examples/one_hop_circuit.rs index d358fa31e..aa0ebd511 100644 --- a/crates/arti-client/examples/one_hop_circuit.rs +++ b/crates/arti-client/examples/one_hop_circuit.rs @@ -39,7 +39,7 @@ async fn launch_one_hop_dir_circ<R: Runtime>( Ok(_) => println!("[+] Successful one-hop circuit to: {:?}", fp), }; } else { - println!("Couldn not find a relay suitable for a directory request."); + println!("Could not find a relay suitable for a directory request."); } Ok(()) } diff --git a/crates/arti-rpc-client-core/arti-rpc-client-core.h b/crates/arti-rpc-client-core/arti-rpc-client-core.h index 0adfc9bd0..9df2961bf 100644 --- a/crates/arti-rpc-client-core/arti-rpc-client-core.h +++ b/crates/arti-rpc-client-core/arti-rpc-client-core.h @@ -66,7 +66,7 @@ * (For example, `ArtiRpcObject **out`). In such cases, `* out` will be set to a resulting object, * or to NULL if no such object is returned. Any earlier value of `*out` will be replaced * without freeing it. - * (If `out` is NULL, then any object the library would have returned will instead be discareded.) + * (If `out` is NULL, then any object the library would have returned will instead be discarded.) * discarded. * While the function is running, * `*out` and `**out` may not be read or written by any other part of the program, diff --git a/crates/arti-rpc-client-core/cbindgen.toml b/crates/arti-rpc-client-core/cbindgen.toml index 1f4b22039..eb51e4da1 100644 --- a/crates/arti-rpc-client-core/cbindgen.toml +++ b/crates/arti-rpc-client-core/cbindgen.toml @@ -75,7 +75,7 @@ header = """\ * (For example, `ArtiRpcObject **out`). In such cases, `* out` will be set to a resulting object, * or to NULL if no such object is returned. Any earlier value of `*out` will be replaced * without freeing it. - * (If `out` is NULL, then any object the library would have returned will instead be discareded.) + * (If `out` is NULL, then any object the library would have returned will instead be discarded.) * discarded. * While the function is running, * `*out` and `**out` may not be read or written by any other part of the program, diff --git a/crates/arti-rpc-client-core/src/conn.rs b/crates/arti-rpc-client-core/src/conn.rs index 1422ab3ca..0547776fc 100644 --- a/crates/arti-rpc-client-core/src/conn.rs +++ b/crates/arti-rpc-client-core/src/conn.rs @@ -27,7 +27,7 @@ pub use connimpl::RpcConn; /// A handle to an open request. /// -/// These handles are crated with [`RpcConn::execute_with_handle`]. +/// These handles are created with [`RpcConn::execute_with_handle`]. #[derive(educe::Educe)] #[educe(Debug)] pub struct RequestHandle { diff --git a/crates/arti-rpc-client-core/src/ffi/err.rs b/crates/arti-rpc-client-core/src/ffi/err.rs index f4f8578c3..650e9ff23 100644 --- a/crates/arti-rpc-client-core/src/ffi/err.rs +++ b/crates/arti-rpc-client-core/src/ffi/err.rs @@ -98,7 +98,7 @@ pub(crate) enum FfiStatus { /// or that Arti wasn't running at the specified location. /// /// (This error was generated by the library.) - ["An IO error ocurred while connecting to Arti"] + ["An IO error occurred while connecting to Arti"] ConnectIo = 3, /// We tried to authenticate with Arti, but it rejected our attempt. diff --git a/crates/arti-rpc-client-core/src/ffi/util.rs b/crates/arti-rpc-client-core/src/ffi/util.rs index c00695eb5..093189dc2 100644 --- a/crates/arti-rpc-client-core/src/ffi/util.rs +++ b/crates/arti-rpc-client-core/src/ffi/util.rs @@ -271,7 +271,7 @@ impl<'a, T> OptOutValExt<T> for Option<OutVal<'a, T>> { /// It is the macro user's responsibility to ensure /// that it conforms to the published API. /// For example, if the return value is a raw pointer, -/// the macro user must ensure it's suitably dereferencable, +/// the macro user must ensure it's suitably dereferenceable, /// that its lifetime is documented, /// and only null when the API says that's allowed. // diff --git a/crates/arti/src/rpc/conntarget.rs b/crates/arti/src/rpc/conntarget.rs index ff40db3e7..0da703820 100644 --- a/crates/arti/src/rpc/conntarget.rs +++ b/crates/arti/src/rpc/conntarget.rs @@ -11,7 +11,7 @@ use tor_rtcompat::Runtime; /// Wrapper around an RPC object that can be used as a connection target, /// or around a TorClient if no RPC object is given. /// -/// Provides an API similar to TorClient, for use when opening SOCKS connetions. +/// Provides an API similar to TorClient, for use when opening SOCKS connections. pub(crate) enum ConnTarget<R: Runtime> { /// An RPC object with accompanying context. Rpc { diff --git a/crates/arti/src/subcommands/hsc.rs b/crates/arti/src/subcommands/hsc.rs index 446dcde99..9c139228f 100644 --- a/crates/arti/src/subcommands/hsc.rs +++ b/crates/arti/src/subcommands/hsc.rs @@ -10,7 +10,7 @@ use tor_rtcompat::Runtime; use std::fs::OpenOptions; use std::io; -/// The hsc subcommands the arti CLI will be augumented with. +/// The hsc subcommands the arti CLI will be augmented with. #[derive(Parser, Debug)] pub(crate) enum HscSubcommands { /// Run state management commands for an Arti hidden service client. diff --git a/crates/equix/fuzz/fuzz_targets/buckets.rs b/crates/equix/fuzz/fuzz_targets/buckets.rs index 597bf3837..baeda7680 100644 --- a/crates/equix/fuzz/fuzz_targets/buckets.rs +++ b/crates/equix/fuzz/fuzz_targets/buckets.rs @@ -150,7 +150,7 @@ fuzz_target!(|ex: Vec<Op>| { unsafe impl Uninit for MemLayout {} let mut ml = MemLayout::alloc(); - // Re-use the MemLayout to run the same test inputs twice + // Reuse the MemLayout to run the same test inputs twice for _ in 0..2 { let mut shape1: Sim<'_, '_, 7, 12> = Sim::Pair { b: BucketArrayPair::new(&mut ml.mem1a, &mut ml.mem1b), diff --git a/crates/equix/src/lib.rs b/crates/equix/src/lib.rs index 9789632cc..d64757249 100644 --- a/crates/equix/src/lib.rs +++ b/crates/equix/src/lib.rs @@ -113,7 +113,7 @@ impl EquiX { /// /// Returns a buffer with a variable number of solutions. /// - /// Allows re-use of solver memory. Preferred for callers which may perform + /// Allows reuse of solver memory. Preferred for callers which may perform /// several solve operations in rapid succession, such as in the common case /// of layering an effort adjustment protocol above Equi-X. pub fn solve_with_memory(&self, mem: &mut SolverMemory) -> SolutionArray { diff --git a/crates/slotmap-careful/src/lib.rs b/crates/slotmap-careful/src/lib.rs index 575717682..f6d50613a 100644 --- a/crates/slotmap-careful/src/lib.rs +++ b/crates/slotmap-careful/src/lib.rs @@ -554,7 +554,7 @@ macro_rules! define_implementation { assert_eq!( key_version(k1) + 1, key_version(k2), - "Key version did not increment by 1 after slot re-use" + "Key version did not increment by 1 after slot reuse" ); ver_lsb_check(k2); diff --git a/crates/tor-basic-utils/src/byte_qty.rs b/crates/tor-basic-utils/src/byte_qty.rs index 1493208a1..805862e85 100644 --- a/crates/tor-basic-utils/src/byte_qty.rs +++ b/crates/tor-basic-utils/src/byte_qty.rs @@ -141,7 +141,7 @@ impl Display for ByteQty { .expect("DISPLAY_UNITS Is empty?!"); // Select a precision so that we'll print about 3 significant figures. - // We can't do this precisely, so we err on the side of slighlty + // We can't do this precisely, so we err on the side of slightly // fewer SF with mantissae starting with 9. let after_decimal = if mantissa < 9. { diff --git a/crates/tor-basic-utils/src/test_rng.rs b/crates/tor-basic-utils/src/test_rng.rs index 970713d2c..10d2b1e2e 100644 --- a/crates/tor-basic-utils/src/test_rng.rs +++ b/crates/tor-basic-utils/src/test_rng.rs @@ -19,7 +19,7 @@ //! * `deterministic` for an arbitrary seed that is the same on every run of //! the program. (You can use this in cases where even a tiny chance of //! stochastic behavior in your tests is unacceptable.) -//! * A hexadecimal string, to specify a given seed to re-use from a previous +//! * A hexadecimal string, to specify a given seed to reuse from a previous //! test run. //! //! # WARNING diff --git a/crates/tor-circmgr/src/lib.rs b/crates/tor-circmgr/src/lib.rs index d746aa277..c37661113 100644 --- a/crates/tor-circmgr/src/lib.rs +++ b/crates/tor-circmgr/src/lib.rs @@ -643,7 +643,7 @@ impl<R: Runtime> CircMgr<R> { // TODO: I would prefer not to call this at every request, but // it should be fine for now. (At some point we may no longer // need this, or might not need to call it so often, now that - // our circuit expiration runs on scheduld timers via + // our circuit expiration runs on scheduled timers via // spawn_expiration_task.) let now = self.mgr.peek_runtime().now(); self.mgr.expire_circs(now); diff --git a/crates/tor-config/src/misc.rs b/crates/tor-config/src/misc.rs index 248fdabcb..5390643ff 100644 --- a/crates/tor-config/src/misc.rs +++ b/crates/tor-config/src/misc.rs @@ -176,7 +176,7 @@ macro_rules! impl_not_auto_value { /// value for the `foo` option. /// /// For example, f field `foo` defaults to `13` if feature `bar` is enabled, -/// and `9000` otherise, a configuration with `foo` set to `"auto"` will +/// and `9000` otherwise, a configuration with `foo` set to `"auto"` will /// behave in the "default" way regardless of which features are enabled. /// /// ```rust,ignore diff --git a/crates/tor-dirclient/src/err.rs b/crates/tor-dirclient/src/err.rs index 0c2367943..be4c7e4e0 100644 --- a/crates/tor-dirclient/src/err.rs +++ b/crates/tor-dirclient/src/err.rs @@ -99,7 +99,7 @@ pub enum RequestError { /// Too much clock skew between us and the directory. /// - /// (We've givin up on this request early, since any directory that it + /// (We've giving up on this request early, since any directory that it /// believes in, we would reject as untimely.) #[error("Too much clock skew with directory cache")] TooMuchClockSkew, diff --git a/crates/tor-dirmgr/src/err.rs b/crates/tor-dirmgr/src/err.rs index 20a533559..3d6ee2404 100644 --- a/crates/tor-dirmgr/src/err.rs +++ b/crates/tor-dirmgr/src/err.rs @@ -432,7 +432,7 @@ pub enum ReadOnlyStorageError { NoDatabase, /// A schema version that is not current. - #[error("Incomaptible data storage schema v{schema}. (We expected v{supported})")] + #[error("Incompatible data storage schema v{schema}. (We expected v{supported})")] IncompatibleSchema { /// The schema version in the database schema: u32, diff --git a/crates/tor-guardmgr/src/sample/candidate.rs b/crates/tor-guardmgr/src/sample/candidate.rs index 3473ae8fa..e705c4bb0 100644 --- a/crates/tor-guardmgr/src/sample/candidate.rs +++ b/crates/tor-guardmgr/src/sample/candidate.rs @@ -67,7 +67,7 @@ pub(crate) enum CandidateStatus<T> { pub(crate) struct Candidate { /// True if the candidate is not currently disabled for use as a guard. /// - /// (To be enabled, it must be in the lastest directory, with the Fast, + /// (To be enabled, it must be in the last directory, with the Fast, /// Stable, and Guard flags.) pub(crate) listed_as_guard: bool, /// True if the candidate can be used as a directory cache. diff --git a/crates/tor-guardmgr/src/vanguards.rs b/crates/tor-guardmgr/src/vanguards.rs index 2ab03f949..efa89223e 100644 --- a/crates/tor-guardmgr/src/vanguards.rs +++ b/crates/tor-guardmgr/src/vanguards.rs @@ -78,7 +78,7 @@ struct Inner { /// If we later switch to "full" vanguards, those previous changes still /// won't be persisted to storage: we only flush to storage if the /// [`VanguardSets`] change *while* we are in "full" mode - /// (changing the [`VanguardMode`] does not consistute a change in the `VanguardSets`). + /// (changing the [`VanguardMode`] does not constitute a change in the `VanguardSets`). // // TODO HS-VANGUARDS: the correct behaviour here might be to never switch back to lite mode // after enabling full vanguards. If we do that, persisting the vanguard sets will be simpler, diff --git a/crates/tor-guardmgr/src/vanguards/set.rs b/crates/tor-guardmgr/src/vanguards/set.rs index 366b6a374..c983957a3 100644 --- a/crates/tor-guardmgr/src/vanguards/set.rs +++ b/crates/tor-guardmgr/src/vanguards/set.rs @@ -375,7 +375,7 @@ impl From<&VanguardSet> for RelayIdSet { } } -// Some acccessors we need in the VanguardMgr tests. +// Some accessors we need in the VanguardMgr tests. #[cfg(test)] derive_deftly_adhoc! { VanguardSets expect items: diff --git a/crates/tor-hsclient/src/relay_info.rs b/crates/tor-hsclient/src/relay_info.rs index da13eea03..85238d43f 100644 --- a/crates/tor-hsclient/src/relay_info.rs +++ b/crates/tor-hsclient/src/relay_info.rs @@ -82,8 +82,8 @@ pub(crate) fn ipt_to_circtarget( #[non_exhaustive] pub enum InvalidTarget { /// The provided link specifiers included some that, when we tried to parse - /// them, proved to be misformed. - #[error("Misformed channel target information provided")] + /// them, proved to be malformed. + #[error("Malformed channel target information provided")] UnparseableChanTargetInfo(#[from] tor_bytes::Error), /// The provided link specifiers were inconsistent with one another, or missing diff --git a/crates/tor-keymgr/src/keystore.rs b/crates/tor-keymgr/src/keystore.rs index 5f0a3c677..b49dc1a53 100644 --- a/crates/tor-keymgr/src/keystore.rs +++ b/crates/tor-keymgr/src/keystore.rs @@ -230,7 +230,7 @@ enum SshKeyDataInner { } impl SshKeyData { - /// Try to covnert a [`KeyData`] to [`SshKeyData`]. + /// Try to convert a [`KeyData`] to [`SshKeyData`]. /// /// Returns an error if this type of [`KeyData`] is not supported. pub(crate) fn try_from_key_data(key: KeyData) -> Result<Self> { @@ -247,7 +247,7 @@ impl SshKeyData { Ok(Self(SshKeyDataInner::Public(key))) } - /// Try to covnert a [`KeypairData`] to [`SshKeyData`]. + /// Try to convert a [`KeypairData`] to [`SshKeyData`]. /// /// Returns an error if this type of [`KeypairData`] is not supported. pub(crate) fn try_from_keypair_data(key: KeypairData) -> Result<Self> { diff --git a/crates/tor-keymgr/src/keystore/ephemeral.rs b/crates/tor-keymgr/src/keystore/ephemeral.rs index 75aead63f..217c30fec 100644 --- a/crates/tor-keymgr/src/keystore/ephemeral.rs +++ b/crates/tor-keymgr/src/keystore/ephemeral.rs @@ -223,7 +223,7 @@ mod tests { assert!(key_store .insert(key().as_ref(), key_spec().as_ref(), key_type_bad()) .is_err()); - // further ensure theres is no sideffects + // further ensure there are no side effects assert!(!key_store .contains(key_spec().as_ref(), key_type_bad()) .unwrap()); @@ -233,7 +233,7 @@ mod tests { .is_none()); assert!(key_store.list().unwrap().is_empty()); - // verify inserting a goood key succeeds + // verify inserting a good key succeeds assert!(key_store .insert(key().as_ref(), key_spec().as_ref(), key_type()) .is_ok()); diff --git a/crates/tor-memquota/src/error.rs b/crates/tor-memquota/src/error.rs index 8a546f730..567d26a03 100644 --- a/crates/tor-memquota/src/error.rs +++ b/crates/tor-memquota/src/error.rs @@ -52,7 +52,7 @@ enum ReclaimedErrorInner { #[default] Collapsed, - /// Othere error from tracker + /// Other error from tracker #[error("{0}")] TrackerError(#[from] Error), } diff --git a/crates/tor-memquota/src/lib.rs b/crates/tor-memquota/src/lib.rs index b4db0bf6f..822f1b89d 100644 --- a/crates/tor-memquota/src/lib.rs +++ b/crates/tor-memquota/src/lib.rs @@ -2,7 +2,7 @@ #![doc = include_str!("../README.md")] #![cfg_attr(not(feature = "memquota"), allow(unused))] -//! ## Intended behavour +//! ## Intended behaviour //! //! In normal operation we try to track as little state as possible, cheaply. //! We do track total memory use in nominal bytes diff --git a/crates/tor-memquota/src/mtracker.rs b/crates/tor-memquota/src/mtracker.rs index 75d0c3548..75dd5c11a 100644 --- a/crates/tor-memquota/src/mtracker.rs +++ b/crates/tor-memquota/src/mtracker.rs @@ -382,13 +382,13 @@ struct State { struct Global { /// Total memory used /// - /// Wrapper type for ensuring we wake up the reclaimation task + /// Wrapper type for ensuring we wake up the reclamation task total_used: TotalQtyNotifier, /// Configuration config: Config, - /// Make this type uninhbaited if memory tracking is compiled out + /// Make this type uninhabited if memory tracking is compiled out #[allow(dead_code)] enabled: EnabledToken, } @@ -426,7 +426,7 @@ struct PRecord { /// The hooks provided by the Participant particip: drop_reentrancy::ProtectedWeak<dyn IsParticipant>, - /// Make this type uninhbaited if memory tracking is compiled out + /// Make this type uninhabited if memory tracking is compiled out #[allow(dead_code)] enabled: EnabledToken, } @@ -585,7 +585,7 @@ impl MemoryQuotaTracker { // Circular parent relationships might need just a little care // in the reclamation loop (to avoid infinitely looping), // but aren't inherently unsupportable. - #[allow(clippy::redundant_closure_call)] // We have IEFEs for good reaons + #[allow(clippy::redundant_closure_call)] // We have IEFEs for good reasons pub fn new_account(self: &Arc<Self>, parent: Option<&Account>) -> crate::Result<Account> { let Enabled(mut state, enabled) = self.lock()? else { return Ok(Account(Noop)); @@ -787,7 +787,7 @@ impl Account { use std::sync::atomic::{AtomicBool, Ordering}; - /// Temporary participant, which stands in during constructon + /// Temporary participant, which stands in during construction #[derive(Debug)] struct TemporaryParticipant { /// The age, which is right now. We hope this is all fast! @@ -815,7 +815,7 @@ impl Account { let partn_ = partn .0 .as_enabled() - .ok_or_else(|| internal!("Enabled Acccount gave Noop Participant"))?; + .ok_or_else(|| internal!("Enabled Account gave Noop Participant"))?; let aid = partn_.aid; let pid_weak = *partn_.pid; @@ -1110,7 +1110,7 @@ impl Participation { /// Destroy this participant /// /// Treat as freed all the memory allocated via this `Participation` and its clones. - /// After this, other clones of this `Participation` are no longer useable: + /// After this, other clones of this `Participation` are no longer usable: /// attempts to do so will give errors. /// (although they can still be used to get at the `Account`, if it still exists). /// @@ -1245,7 +1245,7 @@ impl State { /// The returned `HashSet` includes `parent_aid`, its children, /// their children, and so on. /// - /// Used in the reclaimation algorithm in [`reclaim`]. + /// Used in the reclamation algorithm in [`reclaim`]. fn get_aid_and_children_recursively(&self, parent_aid: AId) -> HashSet<AId> { let mut out = HashSet::<AId>::new(); let mut queue: Vec<AId> = vec![parent_aid]; diff --git a/crates/tor-memquota/src/mtracker/reclaim.rs b/crates/tor-memquota/src/mtracker/reclaim.rs index 12532a0e2..005b7d832 100644 --- a/crates/tor-memquota/src/mtracker/reclaim.rs +++ b/crates/tor-memquota/src/mtracker/reclaim.rs @@ -15,7 +15,7 @@ use deferred_drop::{DeferredDrop, GuardWithDeferredDrop}; /// On 64-bit systems, bigger than the refcounts, which are all `u32` type NumParticips = usize; -//========== candiate victim analysis ========== +//========== candidate victim analysis ========== /// The nominal data age of a participant #[derive(Ord, PartialOrd, Eq, PartialEq)] @@ -109,14 +109,14 @@ fn analyse_particip(precord: &PRecord, defer_drop: &mut DeferredDrop) -> PStatus PStatus::NoData } -//========== reclamation algorith, the main pieces ========== +//========== reclamation algorithm, the main pieces ========== /// State while reclamation is active struct Reclaiming { /// The heap of candidates, oldest at top of heap heap: BinaryHeap<Reverse<(Age, AId)>>, - /// Make this type uninhbaited if memory tracking is compiled out + /// Make this type uninhabited if memory tracking is compiled out enabled: EnabledToken, } diff --git a/crates/tor-memquota/src/mtracker/reclaim/deferred_drop.rs b/crates/tor-memquota/src/mtracker/reclaim/deferred_drop.rs index 3b0742a82..02bd6611e 100644 --- a/crates/tor-memquota/src/mtracker/reclaim/deferred_drop.rs +++ b/crates/tor-memquota/src/mtracker/reclaim/deferred_drop.rs @@ -16,7 +16,7 @@ use super::*; -/// `MutexGuard<State>` but also a list of `Arc<dyn Partcipant>` to drop when we unlock +/// `MutexGuard<State>` but also a list of `Arc<dyn Participant>` to drop when we unlock #[derive(Debug, Default)] pub(super) struct GuardWithDeferredDrop<'m> { /// The mutex guard diff --git a/crates/tor-memquota/src/utils.rs b/crates/tor-memquota/src/utils.rs index 1bede7b09..fa2de3965 100644 --- a/crates/tor-memquota/src/utils.rs +++ b/crates/tor-memquota/src/utils.rs @@ -1,4 +1,4 @@ -//! Miscellanous internal utilities +//! Miscellaneous internal utilities use crate::internal_prelude::*; diff --git a/crates/tor-proto/src/circuit/reactor.rs b/crates/tor-proto/src/circuit/reactor.rs index 7426bb714..8e204c4b0 100644 --- a/crates/tor-proto/src/circuit/reactor.rs +++ b/crates/tor-proto/src/circuit/reactor.rs @@ -1845,7 +1845,7 @@ impl Reactor { ); } if let Some(incomplete) = incomplete { - debug!("{id}: Ignoring parial relay msg received after triggering shutdown: {incomplete:?}", id=self.unique_id); + debug!("{id}: Ignoring partial relay msg received after triggering shutdown: {incomplete:?}", id=self.unique_id); } return Ok(CellStatus::CleanShutdown); } diff --git a/crates/tor-proto/src/util/stream_poll_set.rs b/crates/tor-proto/src/util/stream_poll_set.rs index c701f63fc..2333169ad 100644 --- a/crates/tor-proto/src/util/stream_poll_set.rs +++ b/crates/tor-proto/src/util/stream_poll_set.rs @@ -120,7 +120,7 @@ where /// /// If the `key` is already in use, the parameters are returned without altering `self`. // To *replace* an existing key, we'd need to cancel any pending future and - // ensure that the cancelation is processed before inserting the new key, to + // ensure that the cancellation is processed before inserting the new key, to // ensure we don't assign a value from the previous key to the new key's // stream. pub fn try_insert( @@ -345,7 +345,7 @@ where let Some(peekable) = self.ready_streams.get_mut(&(priority.clone(), key.clone())) else { return Some(Poll::Pending); }; - // We don't have a waker registered here, so we can juse use the noop waker. + // We don't have a waker registered here, so we can just use the noop waker. // TODO: Create a mut future for `PeekableStream`. Some(Pin::new(peekable).poll_peek_mut(&mut Context::from_waker(noop_waker_ref()))) } diff --git a/crates/tor-rpcbase/src/dispatch.rs b/crates/tor-rpcbase/src/dispatch.rs index deddce5b8..a6b9aef2d 100644 --- a/crates/tor-rpcbase/src/dispatch.rs +++ b/crates/tor-rpcbase/src/dispatch.rs @@ -101,7 +101,7 @@ type SpecialResultFuture = BoxFuture<'static, Box<dyn any::Any>>; // (This trait isn't sealed because there _are_ theoretical reasons // why you might want to provide a special implementation.) pub trait Invocable: Send + Sync + 'static { - /// Return the type of object that this Invokable will accept. + /// Return the type of object that this Invocable will accept. fn object_type(&self) -> any::TypeId; /// Return the type of method that this Invocable will accept. fn method_type(&self) -> any::TypeId; @@ -568,7 +568,7 @@ impl_fn_type_of_fn_trait!(A B C D E F); /// Pretend to return a value of type `fn..` corresponding to an `impl Fn` /// -/// Given a function implemneting `FnTypeOfFnTrait`, ie, any `Fn` closure, +/// Given a function implementing `FnTypeOfFnTrait`, ie, any `Fn` closure, /// pretends that it would return a value of the corresponding `fn` type. /// /// Doesn't actually return a value (since that would be impossible): diff --git a/doc/dev/notes/relay-sketch.md b/doc/dev/notes/relay-sketch.md index e86ad7bbe..ecb0d8d85 100644 --- a/doc/dev/notes/relay-sketch.md +++ b/doc/dev/notes/relay-sketch.md @@ -77,7 +77,7 @@ that can function on a testing network. `Arc<dyn ExtendKeyProvider>` or `Arc<RwLock<ExtendKeys>>` may be in order. ([#1443]) -- A new `RelayCirc` type, crated by CREATE2 cells. ([#1445]) +- A new `RelayCirc` type, created by CREATE2 cells. ([#1445]) - DESIGN: [How much code](#proto-objects) can this share internally with ClientCirc? The reactor logic is very similar, @@ -102,7 +102,7 @@ that can function on a testing network. with publishing HS descriptors? - Protocol changes may be needed to remove TAP keys from descriptors and microdescriptors ([torspec#264]) - - Possible short-term workaround: Genearate RSA TAP key and then + - Possible short-term workaround: Generate RSA TAP key and then throw away the private half - Key management for relays. [#1449] diff --git a/doc/hsc.md b/doc/hsc.md index ee0d103ff..e79dfd858 100644 --- a/doc/hsc.md +++ b/doc/hsc.md @@ -6,7 +6,7 @@ plan to extend it to support managing other types of state as well. Like the other `arti` subcommands, it has an optional `--config` option for specifying the TOML configuration file. Using the correct configuration file is important, because the state and keys managed by `arti hsc` are relative to the -state directory, which you might have overriden in the configuration. +state directory, which you might have overridden in the configuration. ## `arti hsc get-key` diff --git a/maint/add_warning b/maint/add_warning index 484fb7244..000626000 100755 --- a/maint/add_warning +++ b/maint/add_warning @@ -109,7 +109,7 @@ LINT_LISTS = { 'test lint' : TEST_LINTS, 'example lint' : EXAMPLE_LINTS, } -# The start delimeter is a regular comment. +# The start delimiter is a regular comment. START_LINE = re.compile(r'^(\s*)// @@ begin (.*) list') # End delimiter is Rustdoc containing an HTML comment, because rustfmt diff --git a/maint/fuzz_it_all b/maint/fuzz_it_all index e95dd9957..c5ebc46c8 100755 --- a/maint/fuzz_it_all +++ b/maint/fuzz_it_all @@ -42,14 +42,14 @@ done echo "Using toolchain +${RUST_FUZZ_TOOLCHAIN:=nightly}. (Override with \$RUST_FUZZ_TOOLCHAIN)" # Validate that "+${RUST_FUZZ_TOOLCHAIN}" is installed. This will log a message to stderr -# if it itsn't. +# if it isn't. cargo "+${RUST_FUZZ_TOOLCHAIN}" -h >/dev/null # Validate that "cargo fuzz" is installed. cargo "+${RUST_FUZZ_TOOLCHAIN}" fuzz --help>/dev/null -# Chdir to the source root diretory, and make sure we have the corpora checked out. +# Chdir to the source root directory, and make sure we have the corpora checked out. cd "$(dirname "$0")/.." if ! test -d "./arti-corpora"; then diff --git a/maint/rust-maint-common/update-shell-includes b/maint/rust-maint-common/update-shell-includes index dd1c980f2..ee0c591d0 100755 --- a/maint/rust-maint-common/update-shell-includes +++ b/maint/rust-maint-common/update-shell-includes @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Arrrange for all shell scripts to obtain the common libraries +# Arrange for all shell scripts to obtain the common libraries # not via the current working directory, but rather realpath $0, by: # # 1. Checking that no shell scripts have ad hoc `.` or `source`'s |