Skip to content

Commit 90f8923

Browse files
martskinsautozimu
authored andcommitted
Remove crossbeam-channel in favor of crossbeam
1 parent bfa0c0c commit 90f8923

File tree

6 files changed

+103
-18
lines changed

6 files changed

+103
-18
lines changed

Cargo.lock

Lines changed: 97 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ maplit = "1"
2525
serde = "1"
2626
serde_derive = "1"
2727
serde_json = "1"
28-
29-
crossbeam-channel = "0.3"
30-
28+
crossbeam = "0.7.3"
3129
jsonrpc-core = "12"
3230
lsp-types = "0.60"
3331
url = "2"

src/language_server_protocol.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl LanguageClient {
2323
})
2424
}
2525

26-
pub fn loop_call(&self, rx: &crossbeam_channel::Receiver<Call>) -> Fallible<()> {
26+
pub fn loop_call(&self, rx: &crossbeam::channel::Receiver<Call>) -> Fallible<()> {
2727
for call in rx.iter() {
2828
let language_client = LanguageClient {
2929
state_mutex: self.state_mutex.clone(),

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fn main() -> Fallible<()> {
6060
let args = Arguments::clap().version(version.as_str());
6161
let _ = args.get_matches();
6262

63-
let (tx, rx) = crossbeam_channel::unbounded();
63+
let (tx, rx) = crossbeam::channel::unbounded();
6464
let language_client = language_client::LanguageClient {
6565
state_mutex: Arc::new(Mutex::new(State::new(tx)?)),
6666
clients_mutex: Arc::new(Mutex::new(HashMap::new())),

src/rpcclient.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::*;
22
use crate::types::{Call, RawMessage};
3-
use crossbeam_channel::{bounded, unbounded, Receiver, Sender};
3+
use crossbeam::channel::{bounded, unbounded, Receiver, Sender};
44

55
#[derive(Clone, Serialize)]
66
pub struct RpcClient {

src/types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ pub struct HighlightSource {
9999
pub struct State {
100100
// Program state.
101101
#[serde(skip_serializing)]
102-
pub tx: crossbeam_channel::Sender<Call>,
102+
pub tx: crossbeam::channel::Sender<Call>,
103103

104104
#[serde(skip_serializing)]
105105
pub clients: HashMap<LanguageId, RpcClient>,
@@ -170,7 +170,7 @@ pub struct State {
170170

171171
impl State {
172172
#[allow(clippy::new_ret_no_self)]
173-
pub fn new(tx: crossbeam_channel::Sender<Call>) -> Fallible<Self> {
173+
pub fn new(tx: crossbeam::channel::Sender<Call>) -> Fallible<Self> {
174174
let logger = logger::init()?;
175175

176176
let client = RpcClient::new(

0 commit comments

Comments
 (0)