remove crossbeam

Author: Yatekii

Cargo.lock

@@ -27,7 +27,6 @@ path = "src/bin/main.rs"
 [dependencies]
 clap = { version = "4", features = ["derive"] }
 config = "0.14"
-crossbeam-channel = "0.5"
 log = { version = "0.4", features = ["serde"] }
 lyon = { version = "1", path = "../lyon/crates/lyon" }
 malloc_size_of_derive = "0.1"

Cargo.toml

@@ -1,8 +1,8 @@
 use std::num::NonZeroU64;
 use std::path::Path;
+use std::sync::mpsc::{channel, Receiver, TryRecvError};
 use std::sync::Arc;
 
-use crossbeam_channel::{unbounded, Receiver, TryRecvError};
 use glyphon::{Cache, FontSystem, Resolution, SwashCache, TextAtlas, TextRenderer, Viewport};
 use nalgebra_glm::{vec2, vec4};
 use notify::{event::ModifyKind, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
@@ -85,7 +85,7 @@ impl Painter {
             label: Some("initial command encoder (loading font atlas, etc)"),
         });
 
-        let (tx, rx) = unbounded();
+        let (tx, rx) = channel();
 
         let mut watcher: RecommendedWatcher =
             match notify::recommended_watcher(move |res| tx.send(res).unwrap()) {

src/bin/drawing/painter.rs

@@ -1,8 +1,8 @@
 #![allow(dead_code)]
 
 use std::path::Path;
+use std::sync::mpsc::{channel, Receiver, TryRecvError};
 
-use crossbeam_channel::{unbounded, TryRecvError};
 use notify::{event::ModifyKind, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
 use osm::drawing::as_byte_slice;
 use wgpu::naga::ShaderStage;
@@ -24,7 +24,7 @@ pub struct Temperature {
     pipeline: RenderPipeline,
     bind_group_layout: BindGroupLayout,
     _bind_group: BindGroup,
-    rx: crossbeam_channel::Receiver<std::result::Result<notify::event::Event, notify::Error>>,
+    rx: Receiver<std::result::Result<notify::event::Event, notify::Error>>,
     _watcher: RecommendedWatcher,
     texture: Texture,
 }
@@ -35,7 +35,7 @@ impl Temperature {
             label: Some("temperature overlay encoder"),
         });
 
-        let (tx, rx) = unbounded();
+        let (tx, rx) = channel();
 
         let mut watcher: RecommendedWatcher =
             match notify::recommended_watcher(move |res| tx.send(res).unwrap()) {

src/bin/drawing/weather/temperature.rs

@@ -1,4 +1,3 @@
-use crossbeam_channel::{unbounded, TryRecvError};
 use nom::{
     branch::alt,
     bytes::complete::{tag, take_while, take_while_m_n},
@@ -13,7 +12,12 @@ use nom::{
     AsChar, Err, IResult, InputTakeAtPosition,
 };
 use notify::{event::ModifyKind, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
-use std::{collections::BTreeMap, num::ParseIntError, path::Path};
+use std::{
+    collections::BTreeMap,
+    num::ParseIntError,
+    path::Path,
+    sync::mpsc::{channel, Receiver, TryRecvError},
+};
 
 /// Tries to parse an entire stylesheet.
 pub fn try_parse_styles(style: &str) -> Option<Vec<Rule>> {
@@ -35,7 +39,7 @@ pub struct RulesCache {
     buffer: String,
     file_path: String,
     pub rules: Vec<Rule>,
-    rx: crossbeam_channel::Receiver<std::result::Result<notify::event::Event, notify::Error>>,
+    rx: Receiver<std::result::Result<notify::event::Event, notify::Error>>,
     _watcher: RecommendedWatcher,
 }
 
@@ -47,7 +51,7 @@ impl RulesCache {
         let buffer: String = std::fs::read_to_string(std::path::Path::new(&file_path))
             .expect("Something went wrong reading the file");
 
-        let (tx, rx) = unbounded();
+        let (tx, rx) = channel();
         let mut _watcher: RecommendedWatcher =
             match notify::recommended_watcher(move |res| tx.send(res).unwrap()) {
                 Ok(watcher) => watcher,