nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 15:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Aleksey Kladov 2018-08-12 21:45:03 +03:00
parent 8dad14b5cd
commit 58c3370819
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/server/src/dispatch.rs
View File

@ -71,19 +71,6 @@ pub fn handle_request<R, F>(req: &mut Option<RawRequest>, f: F) -> Result<()>
}
}
pub fn expect_request<R: ClientRequest>(io: &mut Io, raw: RawRequest)
-> Result<Option<(R::Params, Responder<R>)>>
{
let ret = match parse_request_as::<R>(raw)? {
Ok(x) => Some(x),
Err(raw) => {
unknown_method(io, raw)?;
None
}
};
Ok(ret)
}
fn parse_notification_as<N>(raw: RawNotification) -> Result<::std::result::Result<N::Params, RawNotification>>
where
N: Notification,

28
crates/server/src/main.rs
View File

@ -79,21 +79,30 @@ fn initialize(io: &mut Io) -> Result<()> {
loop {
match io.recv()? {
RawMsg::Request(req) => {
if let Some((_params, resp)) = dispatch::expect_request::<req::Initialize>(io, req)? {
let mut req = Some(req);
dispatch::handle_request::<req::Initialize, _>(&mut req, |_params, resp| {
let res = req::InitializeResult { capabilities: caps::SERVER_CAPABILITIES };
let resp = resp.into_response(Ok(res))?;
io.send(RawMsg::Response(resp));
match io.recv()? {
RawMsg::Notification(n) => {
if n.method != "initialized" {
Ok(())
})?;
match req {
None => {
match io.recv()? {
RawMsg::Notification(n) => {
if n.method != "initialized" {
bail!("expected initialized notification");
}
}
_ => {
bail!("expected initialized notification");
}
}
_ => {
bail!("expected initialized notification");
}
return initialized(io);
}
Some(req) => {
bail!("expected initialize request, got {:?}", req)
}
return initialized(io);
}
}
RawMsg::Notification(n) => {
@ -106,7 +115,6 @@ fn initialize(io: &mut Io) -> Result<()> {
}
}
enum Task {
Respond(RawResponse),
Notify(RawNotification),
@ -301,7 +309,7 @@ fn update_file_notifications_on_threadpool(
}
match publish_decorations(world, uri) {
Err(e) => {
error!("failed to compute decortions: {:?}", e)
error!("failed to compute decorations: {:?}", e)
}
Ok(params) => {
let not = dispatch::send_notification::<req::PublishDecorations>(params);