Merge pull request rust-lang#21135 from Shourya742/2025-11-26-default-json

Veykril · web-flow · commit 98fffb4fa4a4 · 2025-11-26T10:20:54.000Z
fix: Fix proc-macro-srv protocol read implementation
diff --git a/src/tools/rust-analyzer/crates/proc-macro-api/src/legacy_protocol/msg.rs b/src/tools/rust-analyzer/crates/proc-macro-api/src/legacy_protocol/msg.rs
@@ -152,7 +152,7 @@ pub trait Message: serde::Serialize + DeserializeOwned {
     fn read<R: BufRead, C: Codec>(inp: &mut R, buf: &mut C::Buf) -> io::Result<Option<Self>> {
         Ok(match C::read(inp, buf)? {
             None => None,
-            Some(buf) => C::decode(buf)?,
+            Some(buf) => Some(C::decode(buf)?),
         })
     }
     fn write<W: Write, C: Codec>(self, out: &mut W) -> io::Result<()> {

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ pub trait Message: serde::Serialize + DeserializeOwned {`
`152`	`152`	`fn read<R: BufRead, C: Codec>(inp: &mut R, buf: &mut C::Buf) -> io::Result<Option<Self>> {`
`153`	`153`	`Ok(match C::read(inp, buf)? {`
`154`	`154`	`None => None,`
`155`		`- Some(buf) => C::decode(buf)?,`
	`155`	`+ Some(buf) => Some(C::decode(buf)?),`
`156`	`156`	`})`
`157`	`157`	`}`
`158`	`158`	`fn write<W: Write, C: Codec>(self, out: &mut W) -> io::Result<()> {`