aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-01-10 15:53:39 +0000
committerGitHub <[email protected]>2021-01-10 15:53:39 +0000
commite1430d822e20635170c8da92b928d4d89dd1f680 (patch)
treeb74085aa9e933c790fe221fb1e02da8cfa20f28e
parent035fed5f9f7c062da7d23190dab1a7021fd48a5d (diff)
parenta7db8abab7ff04f3e9b7cb7013107dcf37de8687 (diff)
Merge #7237
7237: Use T! for bool keywords r=matklad a=lnicola Co-authored-by: LaurenČ›iu Nicola <[email protected]>
-rw-r--r--crates/parser/src/grammar/type_args.rs2
-rw-r--r--docs/dev/style.md21
2 files changed, 22 insertions, 1 deletions
diff --git a/crates/parser/src/grammar/type_args.rs b/crates/parser/src/grammar/type_args.rs
index debb23fea..42cd426bd 100644
--- a/crates/parser/src/grammar/type_args.rs
+++ b/crates/parser/src/grammar/type_args.rs
@@ -55,7 +55,7 @@ fn generic_arg(p: &mut Parser) {
55 expressions::literal(p); 55 expressions::literal(p);
56 m.complete(p, CONST_ARG); 56 m.complete(p, CONST_ARG);
57 } 57 }
58 TRUE_KW | FALSE_KW => { 58 T![true] | T![false] => {
59 expressions::literal(p); 59 expressions::literal(p);
60 m.complete(p, CONST_ARG); 60 m.complete(p, CONST_ARG);
61 } 61 }
diff --git a/docs/dev/style.md b/docs/dev/style.md
index 67cbc6744..7481f8008 100644
--- a/docs/dev/style.md
+++ b/docs/dev/style.md
@@ -643,6 +643,27 @@ assert!(x >= lo && x <= hi>);
643**Rationale:** Less-then comparisons are more intuitive, they correspond spatially to [real line](https://en.wikipedia.org/wiki/Real_line). 643**Rationale:** Less-then comparisons are more intuitive, they correspond spatially to [real line](https://en.wikipedia.org/wiki/Real_line).
644 644
645 645
646## Token names
647
648Use `T![foo]` instead of `SyntaxKind::FOO_KW`.
649
650```rust
651// GOOD
652match p.current() {
653 T![true] | T![false] => true,
654 _ => false,
655}
656
657// BAD
658
659match p.current() {
660 SyntaxKind::TRUE_KW | SyntaxKind::FALSE_KW => true,
661 _ => false,
662}
663```
664
665**Rationale:** The macro uses the familiar Rust syntax, avoiding ambiguities like "is this a brace or bracket?".
666
646## Documentation 667## Documentation
647 668
648For `.md` and `.adoc` files, prefer a sentence-per-line format, don't wrap lines. 669For `.md` and `.adoc` files, prefer a sentence-per-line format, don't wrap lines.