Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | .github/workflows/ci.yaml | 2 | ||||
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | crates/proc-macro-srv-cli/src/main.rs | 4 | ||||
| -rw-r--r-- | crates/proc-macro-srv/Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/proc-macro-srv/src/server_impl/token_id.rs | 1 |
5 files changed, 3 insertions, 6 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e817f770a4..5975272d87 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -70,7 +70,7 @@ jobs: - name: Test run: cargo test --features sysroot-abi -p proc-macro-srv -p proc-macro-srv-cli -p proc-macro-api -- --quiet - + - name: Check salsa dependency run: "! (cargo tree -p proc-macro-srv-cli | grep -q salsa)" diff --git a/Cargo.lock b/Cargo.lock index 7d133f9949..10cd6cd43c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1856,7 +1856,6 @@ dependencies = [ name = "proc-macro-srv" version = "0.0.0" dependencies = [ - "crossbeam-channel", "expect-test", "intern", "libc", diff --git a/crates/proc-macro-srv-cli/src/main.rs b/crates/proc-macro-srv-cli/src/main.rs index d73d20b584..bdfdb50002 100644 --- a/crates/proc-macro-srv-cli/src/main.rs +++ b/crates/proc-macro-srv-cli/src/main.rs @@ -31,7 +31,7 @@ fn main() -> std::io::Result<()> { clap::Arg::new("format") .long("format") .action(clap::ArgAction::Set) - .default_value("bidirectional-postcard-prototype") + .default_value("json-legacy") .value_parser(clap::builder::EnumValueParser::<ProtocolFormat>::new()), clap::Arg::new("version") .long("version") @@ -71,7 +71,7 @@ impl ValueEnum for ProtocolFormat { Some(clap::builder::PossibleValue::new("postcard-legacy")) } ProtocolFormat::BidirectionalPostcardPrototype => { - Some(clap::builder::PossibleValue::new("postcard-new")) + Some(clap::builder::PossibleValue::new("bidirectional-postcard-prototype")) } } } diff --git a/crates/proc-macro-srv/Cargo.toml b/crates/proc-macro-srv/Cargo.toml index b2abda0bfd..3610171784 100644 --- a/crates/proc-macro-srv/Cargo.toml +++ b/crates/proc-macro-srv/Cargo.toml @@ -22,7 +22,6 @@ paths.workspace = true # span = {workspace = true, default-features = false} does not work span = { path = "../span", version = "0.0.0", default-features = false} intern.workspace = true -crossbeam-channel.workspace = true ra-ap-rustc_lexer.workspace = true diff --git a/crates/proc-macro-srv/src/server_impl/token_id.rs b/crates/proc-macro-srv/src/server_impl/token_id.rs index 3b12644ec3..9db7597d84 100644 --- a/crates/proc-macro-srv/src/server_impl/token_id.rs +++ b/crates/proc-macro-srv/src/server_impl/token_id.rs @@ -141,7 +141,6 @@ impl server::Span for SpanIdServer { /// See PR: /// https://github.com/rust-lang/rust/pull/55780 fn source_text(&mut self, _span: Self::Span) -> Option<String> { - // FIXME requires db, needs special handling wrt fixup spans None } |