Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up spelling #483

Merged
merged 1 commit into from
Sep 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dbus/src/arg/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! Types and traits for easily getting a message's arguments, or appening a message with arguments.
//! Types and traits for easily getting a message's arguments, or appending a message with arguments.
//!
//! Also see the argument's guide (in the examples directory) for details about which Rust
//! types correspond to which D-Bus types.
Expand Down
2 changes: 1 addition & 1 deletion dbus/src/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ fn peer(m: &Message) -> Option<Message> {
return Some(r)
}
}
return Some(m.error(&"org.freedesktop.DBus.Error.Failed".into(), &to_c_str("Failed to retreive UUID")))
return Some(m.error(&"org.freedesktop.DBus.Error.Failed".into(), &to_c_str("Failed to retrieve UUID")))
}
}
Some(m.error(&"org.freedesktop.DBus.Error.UnknownMethod".into(), &to_c_str("Method does not exist")))
Expand Down
4 changes: 2 additions & 2 deletions dbus/src/channel/ffichannel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ impl Channel {
/// Note: In case of an error reply, this is returned as an Err(), not as a Ok(Message) with the error type.
///
/// Note: In case pop_message and send_with_reply_and_block is called in parallel from different threads,
/// they might race to retreive the reply message from the internal queue.
/// they might race to retrieve the reply message from the internal queue.
pub fn send_with_reply_and_block(&self, msg: Message, timeout: Duration) -> Result<Message, Error> {
let mut e = Error::empty();
let response = unsafe {
Expand Down Expand Up @@ -291,7 +291,7 @@ impl Channel {
Ok(self.pop_message())
}

/// Enables watch tracking, a prequisite for calling watch.
/// Enables watch tracking, a prerequisite for calling watch.
///
/// (In theory, this could panic in case libdbus ever changes to listen to
/// something else than one file descriptor,
Expand Down
2 changes: 1 addition & 1 deletion dbus/src/channel/nativechannel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ impl Channel {
/// Note: In case of an error reply, this is returned as an Err(), not as a Ok(Message) with the error type.
///
/// Note: In case pop_message and send_with_reply_and_block is called in parallel from different threads,
/// they might race to retreive the reply message from the internal queue.
/// they might race to retrieve the reply message from the internal queue.
pub fn send_with_reply_and_block(&self, msg: Message, _timeout: Duration) -> Result<Message, Error> {
block_on(async {
// TODO: Timeout
Expand Down
2 changes: 1 addition & 1 deletion dbus/src/ffidisp/watch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub enum WatchEvent {
Readable = ffi::DBUS_WATCH_READABLE as isize,
/// The fd is writable
Writable = ffi::DBUS_WATCH_WRITABLE as isize,
/// An error occured on the fd
/// An error occurred on the fd
Error = ffi::DBUS_WATCH_ERROR as isize,
/// The fd received a hangup.
Hangup = ffi::DBUS_WATCH_HANGUP as isize,
Expand Down
4 changes: 2 additions & 2 deletions dbus/src/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ impl Message {
Ok(R::read(&mut self.iter_init())?)
}

/// Returns a struct for retreiving the arguments from a message. Supersedes get_items().
/// Returns a struct for retrieving the arguments from a message. Supersedes get_items().
pub fn iter_init(&self) -> Iter { Iter::new(&self) }

/// Gets the MessageType of the Message.
Expand Down Expand Up @@ -493,7 +493,7 @@ impl Message {
///
/// When sending a message, a sender will be automatically assigned, so you don't need to call
/// this method. However, it can be very useful in test code that is supposed to handle a method call.
/// This way, you can create a method call and handle it without reciving it from a real D-Bus instance.
/// This way, you can create a method call and handle it without receiving it from a real D-Bus instance.
pub fn set_sender(&mut self, sender: Option<BusName>) {
let c_sender = sender.as_ref().map(|d| d.as_cstr().as_ptr()).unwrap_or(ptr::null());
assert!(unsafe { ffi::dbus_message_set_sender(self.msg, c_sender) } != 0);
Expand Down
2 changes: 1 addition & 1 deletion dbus/src/message/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub enum Error {
UnknownKey,
/// Boolean could not be parsed
BadBoolean,
/// Error that occured while converting a string to a DBus format
/// Error that occurred while converting a string to a DBus format
BadConversion(String),
}

Expand Down
2 changes: 1 addition & 1 deletion dbus/src/methoddisp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ impl<M> Interface<M> {
p
}

/// Add an annotation to this Inteface.
/// Add an annotation to this Interface.
pub fn annotate<N: Into<String>, V: Into<String>>(mut self, name: N, value: V) -> Self {
self.anns.insert(name, value); self
}
Expand Down
2 changes: 1 addition & 1 deletion dbus/src/nonblock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ impl MsgMatch {
}), receiver)
}

/// The token retreived can be used in a call to remove_match to stop matching on the data.
/// The token retrieved can be used in a call to remove_match to stop matching on the data.
pub fn token(&self) -> Token { Token(self.0.token.load(Ordering::SeqCst)) }
}

Expand Down
Loading