aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-07-12 10:57:11 +0100
committerGitHub <[email protected]>2020-07-12 10:57:11 +0100
commit70d1b848eb1b8e2c463040be205ee52757a0e19c (patch)
tree312ac722e0464188c54bbd38a19f8f318334b92f
parent28f0171dbdf51ab02bf3e8090d80dcdf0b733662 (diff)
parente78d468b22eb3624ada96cb3ad0d99a7220a0334 (diff)
Merge #5330
5330: Fix ignore attribute autocompletion r=matklad a=avrong Fixes #5232 <img width="273" alt="image" src="https://user-images.githubusercontent.com/6342851/87242025-a4782400-c431-11ea-91b7-5127f9742122.png"> <img width="238" alt="image" src="https://user-images.githubusercontent.com/6342851/87242044-c96c9700-c431-11ea-8161-f197f8e97ca0.png"> Co-authored-by: Aleksei Trifonov <[email protected]>
-rw-r--r--crates/ra_ide/src/completion/complete_attribute.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_ide/src/completion/complete_attribute.rs b/crates/ra_ide/src/completion/complete_attribute.rs
index 047299de9..d268c92be 100644
--- a/crates/ra_ide/src/completion/complete_attribute.rs
+++ b/crates/ra_ide/src/completion/complete_attribute.rs
@@ -85,7 +85,7 @@ const ATTRIBUTES: &[AttrCompletion] = &[
85 attr("forbid(…)", Some("forbid"), Some("forbid(${0:lint})")), 85 attr("forbid(…)", Some("forbid"), Some("forbid(${0:lint})")),
86 // FIXME: resolve through macro resolution? 86 // FIXME: resolve through macro resolution?
87 attr("global_allocator", None, None).prefer_inner(), 87 attr("global_allocator", None, None).prefer_inner(),
88 attr("ignore()", Some("ignore"), Some("ignore(${0:lint})")), 88 attr(r#"ignore = "…""#, Some("ignore"), Some(r#"ignore = "${0:reason}""#)),
89 attr("inline(…)", Some("inline"), Some("inline(${0:lint})")), 89 attr("inline(…)", Some("inline"), Some("inline(${0:lint})")),
90 attr(r#"link_name = "…""#, Some("link_name"), Some(r#"link_name = "${0:symbol_name}""#)), 90 attr(r#"link_name = "…""#, Some("link_name"), Some(r#"link_name = "${0:symbol_name}""#)),
91 attr("link", None, None), 91 attr("link", None, None),
@@ -300,7 +300,7 @@ struct Test {}
300 at derive(…) 300 at derive(…)
301 at doc = "…" 301 at doc = "…"
302 at forbid(…) 302 at forbid(…)
303 at ignore() 303 at ignore = ""
304 at inline(…) 304 at inline(…)
305 at link 305 at link
306 at link_name = "…" 306 at link_name = "…"
@@ -343,7 +343,7 @@ struct Test {}
343 at feature(…) 343 at feature(…)
344 at forbid(…) 344 at forbid(…)
345 at global_allocator 345 at global_allocator
346 at ignore() 346 at ignore = ""
347 at inline(…) 347 at inline(…)
348 at link 348 at link
349 at link_name = "…" 349 at link_name = "…"