about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-02-26 14:08:38 +0000
committerbors <bors@rust-lang.org>2024-02-26 14:08:38 +0000
commitf7f63ccd8dad1baf581a6508300a581d0532e277 (patch)
tree9516a95aca1531f8f1b672c4baac8872d377cc9a
parent40bf8bf757bf2dfec078a079fef16573928edcbf (diff)
parent1ef7a9971d5213bdf57d11d7ec82ab47a7ec5bec (diff)
downloadrust-f7f63ccd8dad1baf581a6508300a581d0532e277.tar.gz
rust-f7f63ccd8dad1baf581a6508300a581d0532e277.zip
Auto merge of #16680 - lnicola:salsa-doc-test, r=Veykril
internal: Remove salsa compile_fail tests

I can't figure out how to reproduce them, but hopefully fixes these:

![image](https://github.com/rust-lang/rust-analyzer/assets/308347/462dbfc3-5414-42fd-b81d-a3d699fa9a8d)
-rw-r--r--crates/salsa/salsa-macros/src/lib.rs25
1 files changed, 2 insertions, 23 deletions
diff --git a/crates/salsa/salsa-macros/src/lib.rs b/crates/salsa/salsa-macros/src/lib.rs
index 8af48b1e3f8..d3e17c5ebf1 100644
--- a/crates/salsa/salsa-macros/src/lib.rs
+++ b/crates/salsa/salsa-macros/src/lib.rs
@@ -93,29 +93,8 @@ mod query_group;
 /// ## Attribute combinations
 ///
 /// Some attributes are mutually exclusive. For example, it is an error to add
-/// multiple storage specifiers:
-///
-/// ```compile_fail
-/// # use salsa_macros as salsa;
-/// #[salsa::query_group]
-/// trait CodegenDatabase {
-///     #[salsa::input]
-///     #[salsa::memoized]
-///     fn my_query(&self, input: u32) -> u64;
-/// }
-/// ```
-///
-/// It is also an error to annotate a function to `invoke` on an `input` query:
-///
-/// ```compile_fail
-/// # use salsa_macros as salsa;
-/// #[salsa::query_group]
-/// trait CodegenDatabase {
-///     #[salsa::input]
-///     #[salsa::invoke(typeck::my_query)]
-///     fn my_query(&self, input: u32) -> u64;
-/// }
-/// ```
+/// multiple storage specifiers or to annotate a function to `invoke` on an
+/// `input` query.
 #[proc_macro_attribute]
 pub fn query_group(args: TokenStream, input: TokenStream) -> TokenStream {
     query_group::query_group(args, input)