From 99d19c7dcf077cdd06113bf013d6a458289b1ecb Mon Sep 17 00:00:00 2001 From: huntc Date: Sun, 12 Jun 2022 15:16:56 +1000 Subject: Rename channel to mpmc I've renamed the channel module for the MPMC as mpmc. There was a previous debate about this, but I feel that the strategy here avoids importing `channel::channel`. The change leaves `signal::Signal`, but I think that's ok. It is all a bit subjective of course. The bottom line for me is that I really like the term mpmc - it means something to me and aligns with broader naming e.g. in Tokio. --- examples/nrf/src/bin/channel.rs | 2 +- examples/nrf/src/bin/channel_sender_receiver.rs | 2 +- examples/nrf/src/bin/uart_split.rs | 2 +- examples/nrf/src/bin/usb_ethernet.rs | 2 +- examples/nrf/src/bin/usb_hid_keyboard.rs | 2 +- examples/stm32f3/src/bin/button_events.rs | 2 +- examples/stm32h7/src/bin/signal.rs | 2 +- examples/stm32h7/src/bin/usart_split.rs | 2 +- examples/stm32l5/src/bin/usb_ethernet.rs | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'examples') diff --git a/examples/nrf/src/bin/channel.rs b/examples/nrf/src/bin/channel.rs index 476ec09a1..12b463581 100644 --- a/examples/nrf/src/bin/channel.rs +++ b/examples/nrf/src/bin/channel.rs @@ -4,7 +4,7 @@ use defmt::unwrap; use embassy::blocking_mutex::raw::ThreadModeRawMutex; -use embassy::channel::channel::Channel; +use embassy::channel::mpmc::Channel; use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; use embassy_nrf::gpio::{Level, Output, OutputDrive}; diff --git a/examples/nrf/src/bin/channel_sender_receiver.rs b/examples/nrf/src/bin/channel_sender_receiver.rs index c79f2fd6b..1742dcc9e 100644 --- a/examples/nrf/src/bin/channel_sender_receiver.rs +++ b/examples/nrf/src/bin/channel_sender_receiver.rs @@ -4,7 +4,7 @@ use defmt::unwrap; use embassy::blocking_mutex::raw::NoopRawMutex; -use embassy::channel::channel::{Channel, Receiver, Sender}; +use embassy::channel::mpmc::{Channel, Receiver, Sender}; use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; use embassy::util::Forever; diff --git a/examples/nrf/src/bin/uart_split.rs b/examples/nrf/src/bin/uart_split.rs index 3fde2f0d8..958cfeba0 100644 --- a/examples/nrf/src/bin/uart_split.rs +++ b/examples/nrf/src/bin/uart_split.rs @@ -4,7 +4,7 @@ use defmt::*; use embassy::blocking_mutex::raw::ThreadModeRawMutex; -use embassy::channel::channel::Channel; +use embassy::channel::mpmc::Channel; use embassy::executor::Spawner; use embassy_nrf::peripherals::UARTE0; use embassy_nrf::uarte::UarteRx; diff --git a/examples/nrf/src/bin/usb_ethernet.rs b/examples/nrf/src/bin/usb_ethernet.rs index 49f2fb89a..3d85d22bb 100644 --- a/examples/nrf/src/bin/usb_ethernet.rs +++ b/examples/nrf/src/bin/usb_ethernet.rs @@ -8,7 +8,7 @@ use core::sync::atomic::{AtomicBool, Ordering}; use core::task::Waker; use defmt::*; use embassy::blocking_mutex::raw::ThreadModeRawMutex; -use embassy::channel::Channel; +use embassy::channel::mpmc::Channel; use embassy::executor::Spawner; use embassy::util::Forever; use embassy_net::tcp::TcpSocket; diff --git a/examples/nrf/src/bin/usb_hid_keyboard.rs b/examples/nrf/src/bin/usb_hid_keyboard.rs index d855a3a57..d7affae11 100644 --- a/examples/nrf/src/bin/usb_hid_keyboard.rs +++ b/examples/nrf/src/bin/usb_hid_keyboard.rs @@ -6,7 +6,7 @@ use core::mem; use core::sync::atomic::{AtomicBool, Ordering}; use defmt::*; -use embassy::channel::Signal; +use embassy::channel::signal::Signal; use embassy::executor::Spawner; use embassy::interrupt::InterruptExt; use embassy::time::Duration; diff --git a/examples/stm32f3/src/bin/button_events.rs b/examples/stm32f3/src/bin/button_events.rs index 06e8eec1f..593701799 100644 --- a/examples/stm32f3/src/bin/button_events.rs +++ b/examples/stm32f3/src/bin/button_events.rs @@ -12,7 +12,7 @@ use defmt::*; use embassy::blocking_mutex::raw::ThreadModeRawMutex; -use embassy::channel::channel::Channel; +use embassy::channel::mpmc::Channel; use embassy::executor::Spawner; use embassy::time::{with_timeout, Duration, Timer}; use embassy_stm32::exti::ExtiInput; diff --git a/examples/stm32h7/src/bin/signal.rs b/examples/stm32h7/src/bin/signal.rs index d2531b2ba..c63b2836c 100644 --- a/examples/stm32h7/src/bin/signal.rs +++ b/examples/stm32h7/src/bin/signal.rs @@ -8,7 +8,7 @@ use defmt_rtt as _; use panic_probe as _; -use embassy::channel::Signal; +use embassy::channel::signal::Signal; use embassy::executor::Spawner; use embassy::time::{Duration, Timer}; diff --git a/examples/stm32h7/src/bin/usart_split.rs b/examples/stm32h7/src/bin/usart_split.rs index 40a7c3e44..eb3f9578c 100644 --- a/examples/stm32h7/src/bin/usart_split.rs +++ b/examples/stm32h7/src/bin/usart_split.rs @@ -5,7 +5,7 @@ use defmt::*; use defmt_rtt as _; // global logger use embassy::blocking_mutex::raw::ThreadModeRawMutex; -use embassy::channel::channel::Channel; +use embassy::channel::mpmc::Channel; use embassy::executor::Spawner; use embassy_stm32::dma::NoDma; use embassy_stm32::{ diff --git a/examples/stm32l5/src/bin/usb_ethernet.rs b/examples/stm32l5/src/bin/usb_ethernet.rs index fa445eece..526b27530 100644 --- a/examples/stm32l5/src/bin/usb_ethernet.rs +++ b/examples/stm32l5/src/bin/usb_ethernet.rs @@ -8,7 +8,7 @@ use core::task::Waker; use defmt::*; use defmt_rtt as _; // global logger use embassy::blocking_mutex::raw::ThreadModeRawMutex; -use embassy::channel::Channel; +use embassy::channel::mpmc::Channel; use embassy::executor::Spawner; use embassy::util::Forever; use embassy_net::tcp::TcpSocket; -- cgit