From 82cc1ec5c603153948e08d8502f0e35290021cdb Mon Sep 17 00:00:00 2001 From: Arthur Milchior Date: Sun, 28 Jan 2024 11:01:17 +0100 Subject: [PATCH 1/3] Add link in salsa --- src/salsa.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/salsa.md b/src/salsa.md index 47442ae14..a8f5d848e 100644 --- a/src/salsa.md +++ b/src/salsa.md @@ -11,8 +11,14 @@ Matsakis. > As of November 2022, although Salsa is inspired by > (among other things) rustc's query system, it is not used directly in rustc. -> It _is_ used in chalk and extensively in `rust-analyzer`, but there are no -> medium or long-term concrete plans to integrate it into the compiler. +> It _is_ used in [chalk], the library for the trait system, and extensively in +> [`rust-analyzer`], the implementation of the language server protocol, but +> there are no medium or long-term concrete plans to integrate it into the +> compiler. + + +[`rust-analyzer`]: https://rust-analyzer.github.io/ +[chalk]: https://rust-lang.github.io/chalk/book/what_is_chalk.html ## What is Salsa? From a92948f2328052e28e8a4c808e4b2fe61550f234 Mon Sep 17 00:00:00 2001 From: Arthur Milchior Date: Sun, 28 Jan 2024 16:04:53 +0100 Subject: [PATCH 2/3] Update src/salsa.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: León Orell Valerian Liehr --- src/salsa.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/salsa.md b/src/salsa.md index a8f5d848e..6ed6bbb5a 100644 --- a/src/salsa.md +++ b/src/salsa.md @@ -12,7 +12,7 @@ Matsakis. > As of November 2022, although Salsa is inspired by > (among other things) rustc's query system, it is not used directly in rustc. > It _is_ used in [chalk], the library for the trait system, and extensively in -> [`rust-analyzer`], the implementation of the language server protocol, but +> [`rust-analyzer`], the official implementation of the language server protocol for Rust, but > there are no medium or long-term concrete plans to integrate it into the > compiler. From 82ae86e5c655b168fd182260a085fc2820153635 Mon Sep 17 00:00:00 2001 From: Arthur Milchior Date: Sun, 28 Jan 2024 16:04:59 +0100 Subject: [PATCH 3/3] Update src/salsa.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: León Orell Valerian Liehr --- src/salsa.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/salsa.md b/src/salsa.md index 6ed6bbb5a..a49c324da 100644 --- a/src/salsa.md +++ b/src/salsa.md @@ -11,7 +11,7 @@ Matsakis. > As of November 2022, although Salsa is inspired by > (among other things) rustc's query system, it is not used directly in rustc. -> It _is_ used in [chalk], the library for the trait system, and extensively in +> It _is_ used in [chalk], an implementation of Rust's trait system, and extensively in > [`rust-analyzer`], the official implementation of the language server protocol for Rust, but > there are no medium or long-term concrete plans to integrate it into the > compiler.