diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 89bc78072074bda448108b1ec4c4bf086353d91f..7daccbbaae922ea798748de73fd30040b3daee9d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,7 +2,7 @@ Thank you (again) for your interest in the project! -## Talk to us before commiting to a change +## Talk to us before committing to a change We recommend you come and talk to us in the channel and/or open an issue before you start working on a feature, to **see if it aligns with our goals**. diff --git a/parsers/ChangeLog b/parsers/ChangeLog index b8721e58a30261ff4adbfc479b05c00cf3618d67..003492bd0e8d9f16b1a834d0782926a9830b51c8 100644 --- a/parsers/ChangeLog +++ b/parsers/ChangeLog @@ -24,6 +24,7 @@ XXXX-YY-ZZ RELEASER nothing so far uses it for anything but this message. We can always change it again once any other specification allows e.g. presences or iqs. + - Module `jingle_thumnails` renamed to `jingle_thumbnails`. * New parsers/serialisers: - Stream Features (RFC 6120) (!400) - Extensible SASL Profile (XEP-0388) diff --git a/parsers/src/jingle_thumnails.rs b/parsers/src/jingle_thumbnails.rs similarity index 97% rename from parsers/src/jingle_thumnails.rs rename to parsers/src/jingle_thumbnails.rs index 59de078a70a9c96b939ce52eae1f402a23706e42..879c53580cca4c98630c2f21fb876bdafb38a891 100644 --- a/parsers/src/jingle_thumnails.rs +++ b/parsers/src/jingle_thumbnails.rs @@ -33,7 +33,7 @@ pub struct Thumbnail { #[cfg(test)] mod tests { - use crate::jingle_thumnails::Thumbnail; + use crate::jingle_thumbnails::Thumbnail; use minidom::Element; #[test] diff --git a/parsers/src/lib.rs b/parsers/src/lib.rs index dc19160ea5e1de8fc2da4142a8710f5f6e840047..d7920089299d32ee02f6a2bae231d4f74fd48257 100644 --- a/parsers/src/lib.rs +++ b/parsers/src/lib.rs @@ -196,7 +196,7 @@ pub mod jingle_s5b; pub mod jingle_ibb; /// XEP-0264: Jingle Content Thumbnails -pub mod jingle_thumnails; +pub mod jingle_thumbnails; /// XEP-0280: Message Carbons pub mod carbons; diff --git a/sasl/src/client/mechanisms/scram.rs b/sasl/src/client/mechanisms/scram.rs index 262c8db2fe264fab1c54d0e03b7d00f151a67501..5c29188c76fae79b95a6ac2ad13b6d687541bc6d 100644 --- a/sasl/src/client/mechanisms/scram.rs +++ b/sasl/src/client/mechanisms/scram.rs @@ -61,7 +61,7 @@ impl Scram { } /// Sets extension data to be inserted into the client's first message. - /// Extension data must be in the format of a comma seperated list of SCRAM extensions to be used e.g. `foo=true,bar=baz` + /// Extension data must be in the format of a comma separated list of SCRAM extensions to be used e.g. `foo=true,bar=baz` /// If not called, no extensions will be used for the clients first message. pub fn with_first_extensions(mut self, extensions: String) -> Self { self.client_first_extensions = extensions; @@ -69,7 +69,7 @@ impl Scram { } /// Sets extension data to be inserted into the client's final message. - /// Extension data must be in the format of a comma seperated list of SCRAM extensions to be used e.g. `foo=true,bar=baz` + /// Extension data must be in the format of a comma separated list of SCRAM extensions to be used e.g. `foo=true,bar=baz` /// If not called, no extensions will be used for the clients final message. pub fn with_final_extensions(mut self, extensions: String) -> Self { self.client_final_extensions = extensions; diff --git a/tokio-xmpp/src/xmlstream/common.rs b/tokio-xmpp/src/xmlstream/common.rs index c94a6c0e9084eefee3ad1e69bf43a9d9a3af7ddc..5a05a2414d023cdbdc55e52a21e08d3d759d9d15 100644 --- a/tokio-xmpp/src/xmlstream/common.rs +++ b/tokio-xmpp/src/xmlstream/common.rs @@ -32,7 +32,7 @@ use xmpp_parsers::ns::STREAM as XML_STREAM_NS; /// Configuration for timeouts on an XML stream. /// /// The defaults are tuned toward common desktop/laptop use and may not hold -/// up to extreme conditions (arctic sattelite link, mobile internet on a +/// up to extreme conditions (arctic satellite link, mobile internet on a /// train in Brandenburg, Germany, and similar) and may be inefficient in /// other conditions (stable server link, localhost communication). #[derive(Debug, Clone, Copy)] diff --git a/xso-proc/src/field/child.rs b/xso-proc/src/field/child.rs index 8db8072b32d800c1a5a6e01301f9764ecefc8adf..c64792902a9035e4d56cfafa1535b30186617686 100644 --- a/xso-proc/src/field/child.rs +++ b/xso-proc/src/field/child.rs @@ -338,7 +338,7 @@ impl ExtractDef { // thing no matter whether the extracted field is of type // `Option` or `T`. // - // And then, type inferrence does the rest: There is ambiguity + // And then, type inference does the rest: There is ambiguity // there, of course, if we call `.into()` on a value of type // `Option`: Should Rust wrap it into another layer of // `Option`, or should it just move the value? The answer lies in diff --git a/xso-proc/src/field/mod.rs b/xso-proc/src/field/mod.rs index 55f6eaab8f76f25febd7da2b2ba8a449ebca6667..e9d995b37f8f217270523578b5fad37df49a1baa 100644 --- a/xso-proc/src/field/mod.rs +++ b/xso-proc/src/field/mod.rs @@ -235,7 +235,7 @@ fn default_name(span: Span, name: Option, field_ident: Option<&Ident>) /// `field_ident` is, for some field types, used to infer an XML name if /// it is not specified explicitly. /// -/// `field_ty` is needed for type inferrence on extracted fields. +/// `field_ty` is needed for type inference on extracted fields. /// /// `container_namespace` is used in some cases to insert a default /// namespace. diff --git a/xso-proc/src/meta.rs b/xso-proc/src/meta.rs index 13e2d26ac54ad32d6e6a4ed1744096bc224882c9..acbde83e546631b4363dff45473cc0f9ef1d7391 100644 --- a/xso-proc/src/meta.rs +++ b/xso-proc/src/meta.rs @@ -475,7 +475,7 @@ impl XmlCompoundMeta { /// in case parsing the type path does then fail. fn maybe_type_path(p: parse::ParseStream<'_>) -> (bool, Option) { // ParseStream cursors do not advance the stream, but they are also rather - // unwieldly to use. Prepare for a lot of `let .. = ..`. + // unwieldy to use. Prepare for a lot of `let .. = ..`. let cursor = if p.peek(token::PathSep) { // If we have a path separator, we need to skip that initially. We diff --git a/xso-proc/src/types.rs b/xso-proc/src/types.rs index b3713083e7b16b7f18b00b30e9bac6aab5a173c5..cd74b133acd64f6454acc9bb266e6496d2e9d08b 100644 --- a/xso-proc/src/types.rs +++ b/xso-proc/src/types.rs @@ -299,7 +299,7 @@ pub(crate) fn as_xml_text_fn(ty: Type) -> Expr { } /// Construct a [`syn::Path`] referring to `::xso::TextCodec::<#for_ty>`, -/// returing the span of `for_ty` alongside it. +/// returning the span of `for_ty` alongside it. fn text_codec_of(for_ty: Type) -> (Span, Path) { let span = for_ty.span(); ( diff --git a/xso/src/error.rs b/xso/src/error.rs index 8b06a2e563d3da3643871d7c871b5a4153fcd782..f7dd9b98f950549d5eecbeda56eaf2f1922706d9 100644 --- a/xso/src/error.rs +++ b/xso/src/error.rs @@ -183,7 +183,7 @@ pub enum FromElementError { /// Contains the original `Element` unmodified. Mismatch(minidom::Element), - /// During processing of the element, an (unrecoverable) error occured. + /// During processing of the element, an (unrecoverable) error occurred. Invalid(Error), } diff --git a/xso/src/from_xml_doc.md b/xso/src/from_xml_doc.md index 46d2903f1a2391b15346877dbe12b0f0ef782c7e..77aa3dc38038bb54ec0d880a91c561bfec0e74a5 100644 --- a/xso/src/from_xml_doc.md +++ b/xso/src/from_xml_doc.md @@ -199,7 +199,7 @@ Dynamic enum variants are completely independent of one another and thus use the same meta structure as structs. See [Struct meta](#struct-meta) for details. -The `builder`, `iterator` and `debug` keys cannot be used on dynmaic enum +The `builder`, `iterator` and `debug` keys cannot be used on dynamic enum variants. #### Example @@ -527,7 +527,7 @@ in regard of the specific serialisation of a field: it is possible to exchange a nested child element for an attribute without changing the Rust interface of the struct. -On the other hand, `extract` meta declarations can quickly become unwieldly +On the other hand, `extract` meta declarations can quickly become unwieldy and they may not support all configuration options which may in the future be added on structs (such as configuring handling of undeclared attributes) and they cannot be used for enumerations. diff --git a/xso/src/fromxml.rs b/xso/src/fromxml.rs index 56d86c8f7b6a17d63dc5fd9a83ade52f3f297509..1b980661b0f21a2c998f3546617597ef8c4ea84a 100644 --- a/xso/src/fromxml.rs +++ b/xso/src/fromxml.rs @@ -309,7 +309,7 @@ mod tests { } #[test] - fn fallible_builder_missmatch_passthrough() { + fn fallible_builder_mismatch_passthrough() { match Result::::from_events(qname(), attrs()) { Err(FromEventsError::Mismatch { .. }) => (), other => panic!("unexpected result: {:?}", other), diff --git a/xso/src/minidom_compat.rs b/xso/src/minidom_compat.rs index f70b6b68adb4c30ea16d219af87b1d368675a171..0c521d0e98a4cfcbe3747d10c9dafec215559221 100644 --- a/xso/src/minidom_compat.rs +++ b/xso/src/minidom_compat.rs @@ -43,7 +43,7 @@ enum IntoEventsInner { /// End of iteration: this state generates an end-of-iterator state. /// /// Note that the [`rxml::Event::EndElement`] event for the element itself - /// is generated by the iterator alraedy in the `Nodes` state, when + /// is generated by the iterator already in the `Nodes` state, when /// `nested` is None and `remaining` returns `None` from its `next()` /// implementation. Fin, diff --git a/xso/src/rxml_util.rs b/xso/src/rxml_util.rs index 50750ee3a5661a010aabf92a20fe60070b3bf8c3..f74bd2a745b02d8b1ec96f976c00995a48b72eaa 100644 --- a/xso/src/rxml_util.rs +++ b/xso/src/rxml_util.rs @@ -306,7 +306,7 @@ mod tests_minidom { assert_eq!(items.len(), 1); match items[0] { Item::XmlDeclaration(XmlVersion::V1_0) => (), - ref other => panic!("unexected item in position 0: {:?}", other), + ref other => panic!("unexpected item in position 0: {:?}", other), }; } @@ -327,15 +327,15 @@ mod tests_minidom { assert_eq!(&**ns, Namespace::none()); assert_eq!(&**name, "elem"); } - ref other => panic!("unexected item in position 0: {:?}", other), + ref other => panic!("unexpected item in position 0: {:?}", other), }; match items[1] { Item::ElementHeadEnd => (), - ref other => panic!("unexected item in position 1: {:?}", other), + ref other => panic!("unexpected item in position 1: {:?}", other), }; match items[2] { Item::ElementFoot => (), - ref other => panic!("unexected item in position 2: {:?}", other), + ref other => panic!("unexpected item in position 2: {:?}", other), }; } @@ -362,7 +362,7 @@ mod tests_minidom { assert_eq!(&**ns, Namespace::none()); assert_eq!(&**name, "elem"); } - ref other => panic!("unexected item in position 0: {:?}", other), + ref other => panic!("unexpected item in position 0: {:?}", other), }; match items[1] { Item::Attribute(ref ns, ref name, ref value) => { @@ -370,15 +370,15 @@ mod tests_minidom { assert_eq!(&**name, "attr"); assert_eq!(&**value, "value"); } - ref other => panic!("unexected item in position 1: {:?}", other), + ref other => panic!("unexpected item in position 1: {:?}", other), }; match items[2] { Item::ElementHeadEnd => (), - ref other => panic!("unexected item in position 2: {:?}", other), + ref other => panic!("unexpected item in position 2: {:?}", other), }; match items[3] { Item::ElementFoot => (), - ref other => panic!("unexected item in position 3: {:?}", other), + ref other => panic!("unexpected item in position 3: {:?}", other), }; } @@ -400,21 +400,21 @@ mod tests_minidom { assert_eq!(&**ns, Namespace::none()); assert_eq!(&**name, "elem"); } - ref other => panic!("unexected item in position 0: {:?}", other), + ref other => panic!("unexpected item in position 0: {:?}", other), }; match items[1] { Item::ElementHeadEnd => (), - ref other => panic!("unexected item in position 1: {:?}", other), + ref other => panic!("unexpected item in position 1: {:?}", other), }; match items[2] { Item::Text(ref value) => { assert_eq!(value, "Hello World!"); } - ref other => panic!("unexected item in position 2: {:?}", other), + ref other => panic!("unexpected item in position 2: {:?}", other), }; match items[3] { Item::ElementFoot => (), - ref other => panic!("unexected item in position 3: {:?}", other), + ref other => panic!("unexpected item in position 3: {:?}", other), }; } } @@ -446,7 +446,7 @@ mod tests { assert_eq!(events.len(), 1); match events[0] { Event::XmlDeclaration(_, XmlVersion::V1_0) => (), - ref other => panic!("unexected event in position 0: {:?}", other), + ref other => panic!("unexpected event in position 0: {:?}", other), }; } @@ -465,11 +465,11 @@ mod tests { assert_eq!(ns, Namespace::none()); assert_eq!(name, "elem"); } - ref other => panic!("unexected event in position 0: {:?}", other), + ref other => panic!("unexpected event in position 0: {:?}", other), }; match events[1] { Event::EndElement(_) => (), - ref other => panic!("unexected event in position 1: {:?}", other), + ref other => panic!("unexpected event in position 1: {:?}", other), }; } @@ -487,11 +487,11 @@ mod tests { assert_eq!(ns, Namespace::none()); assert_eq!(name, "elem"); } - ref other => panic!("unexected event in position 0: {:?}", other), + ref other => panic!("unexpected event in position 0: {:?}", other), }; match events[1] { Event::EndElement(_) => (), - ref other => panic!("unexected event in position 1: {:?}", other), + ref other => panic!("unexpected event in position 1: {:?}", other), }; } @@ -511,17 +511,17 @@ mod tests { assert_eq!(ns, Namespace::none()); assert_eq!(name, "elem"); } - ref other => panic!("unexected event in position 0: {:?}", other), + ref other => panic!("unexpected event in position 0: {:?}", other), }; match events[1] { Event::Text(_, ref value) => { assert_eq!(value, "Hello World!"); } - ref other => panic!("unexected event in position 1: {:?}", other), + ref other => panic!("unexpected event in position 1: {:?}", other), }; match events[2] { Event::EndElement(_) => (), - ref other => panic!("unexected event in position 2: {:?}", other), + ref other => panic!("unexpected event in position 2: {:?}", other), }; } @@ -549,11 +549,11 @@ mod tests { Some("value") ); } - ref other => panic!("unexected event in position 0: {:?}", other), + ref other => panic!("unexpected event in position 0: {:?}", other), }; match events[1] { Event::EndElement(_) => (), - ref other => panic!("unexected event in position 2: {:?}", other), + ref other => panic!("unexpected event in position 2: {:?}", other), }; } } diff --git a/xso/src/text.rs b/xso/src/text.rs index 0d77c04ff8d4415580a64ac636f82f215773319f..bcd4edfcb9b164e87d3ae45fda653aaf0cdcabd2 100644 --- a/xso/src/text.rs +++ b/xso/src/text.rs @@ -149,7 +149,7 @@ pub trait TextCodec { /// content by stripping it. // NOTE: The bound on T is needed because any given type A may implement // TextCodec for any number of types. If we pass T down to the `Filtered` - // struct, rustc can do type inferrence on which `TextCodec` + // struct, rustc can do type inference on which `TextCodec` // implementation the `filtered` method is supposed to have been called // on. fn filtered(self, filter: F) -> Filtered