diff options
author | Aleksey Kladov <[email protected]> | 2018-09-02 13:18:43 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-09-02 13:18:43 +0100 |
commit | 1329dd4e287c137ec0a90abeec0272275b2b2c8d (patch) | |
tree | d924f7bcc28b9c46d1643d54c5a2f109d19b2977 /crates/gen_lsp_server | |
parent | 80be61ed78e8410e013cb94879435d54a4907c30 (diff) |
Avoid clones
Diffstat (limited to 'crates/gen_lsp_server')
-rw-r--r-- | crates/gen_lsp_server/src/lib.rs | 4 | ||||
-rw-r--r-- | crates/gen_lsp_server/src/msg.rs | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/crates/gen_lsp_server/src/lib.rs b/crates/gen_lsp_server/src/lib.rs index 0dc24ffc1..b25017045 100644 --- a/crates/gen_lsp_server/src/lib.rs +++ b/crates/gen_lsp_server/src/lib.rs | |||
@@ -51,7 +51,7 @@ pub fn run_server( | |||
51 | pub fn handle_shutdown(req: RawRequest, sender: &Sender<RawMessage>) -> Option<RawRequest> { | 51 | pub fn handle_shutdown(req: RawRequest, sender: &Sender<RawMessage>) -> Option<RawRequest> { |
52 | match req.cast::<Shutdown>() { | 52 | match req.cast::<Shutdown>() { |
53 | Ok((id, ())) => { | 53 | Ok((id, ())) => { |
54 | let resp = RawResponse::ok::<Shutdown>(id, ()); | 54 | let resp = RawResponse::ok::<Shutdown>(id, &()); |
55 | sender.send(RawMessage::Response(resp)); | 55 | sender.send(RawMessage::Response(resp)); |
56 | None | 56 | None |
57 | } | 57 | } |
@@ -72,7 +72,7 @@ fn initialize( | |||
72 | msg => | 72 | msg => |
73 | bail!("expected initialize request, got {:?}", msg), | 73 | bail!("expected initialize request, got {:?}", msg), |
74 | }; | 74 | }; |
75 | let resp = RawResponse::ok::<Initialize>(id, InitializeResult { capabilities: caps }); | 75 | let resp = RawResponse::ok::<Initialize>(id, &InitializeResult { capabilities: caps }); |
76 | sender.send(RawMessage::Response(resp)); | 76 | sender.send(RawMessage::Response(resp)); |
77 | match receiver.recv() { | 77 | match receiver.recv() { |
78 | Some(RawMessage::Notification(n)) => { | 78 | Some(RawMessage::Notification(n)) => { |
diff --git a/crates/gen_lsp_server/src/msg.rs b/crates/gen_lsp_server/src/msg.rs index 42241194d..7fcac6f6d 100644 --- a/crates/gen_lsp_server/src/msg.rs +++ b/crates/gen_lsp_server/src/msg.rs | |||
@@ -88,7 +88,7 @@ impl RawMessage { | |||
88 | } | 88 | } |
89 | 89 | ||
90 | impl RawRequest { | 90 | impl RawRequest { |
91 | pub fn new<R>(id: u64, params: R::Params) -> RawRequest | 91 | pub fn new<R>(id: u64, params: &R::Params) -> RawRequest |
92 | where | 92 | where |
93 | R: Request, | 93 | R: Request, |
94 | R::Params: Serialize, | 94 | R::Params: Serialize, |
@@ -96,7 +96,7 @@ impl RawRequest { | |||
96 | RawRequest { | 96 | RawRequest { |
97 | id: id, | 97 | id: id, |
98 | method: R::METHOD.to_string(), | 98 | method: R::METHOD.to_string(), |
99 | params: to_value(¶ms).unwrap(), | 99 | params: to_value(params).unwrap(), |
100 | } | 100 | } |
101 | } | 101 | } |
102 | pub fn cast<R>(self) -> ::std::result::Result<(u64, R::Params), RawRequest> | 102 | pub fn cast<R>(self) -> ::std::result::Result<(u64, R::Params), RawRequest> |
@@ -114,7 +114,7 @@ impl RawRequest { | |||
114 | } | 114 | } |
115 | 115 | ||
116 | impl RawResponse { | 116 | impl RawResponse { |
117 | pub fn ok<R>(id: u64, result: R::Result) -> RawResponse | 117 | pub fn ok<R>(id: u64, result: &R::Result) -> RawResponse |
118 | where R: Request, | 118 | where R: Request, |
119 | R::Result: Serialize, | 119 | R::Result: Serialize, |
120 | { | 120 | { |
@@ -135,14 +135,14 @@ impl RawResponse { | |||
135 | } | 135 | } |
136 | 136 | ||
137 | impl RawNotification { | 137 | impl RawNotification { |
138 | pub fn new<N>(params: N::Params) -> RawNotification | 138 | pub fn new<N>(params: &N::Params) -> RawNotification |
139 | where | 139 | where |
140 | N: Notification, | 140 | N: Notification, |
141 | N::Params: Serialize, | 141 | N::Params: Serialize, |
142 | { | 142 | { |
143 | RawNotification { | 143 | RawNotification { |
144 | method: N::METHOD.to_string(), | 144 | method: N::METHOD.to_string(), |
145 | params: to_value(¶ms).unwrap(), | 145 | params: to_value(params).unwrap(), |
146 | } | 146 | } |
147 | } | 147 | } |
148 | pub fn cast<N>(self) -> ::std::result::Result<N::Params, RawNotification> | 148 | pub fn cast<N>(self) -> ::std::result::Result<N::Params, RawNotification> |