Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix weak keywords #1685

Merged
merged 3 commits into from
Dec 3, 2024
+13 −7
Merged

Fix weak keywords #1685

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c160ecf
Move weak keyword lexer section to the top
ehuss Nov 25, 2024
fb9701c
Add `safe` keyword to lexer list
ehuss Nov 25, 2024
1dd1c64
Add `raw` weak keyword
ehuss Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/keywords.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,16 @@ The following keywords are reserved beginning in the 2024 edition.
These keywords have special meaning only in certain contexts. For example, it
is possible to declare a variable or method with the name `union`.

> **<sup>Lexer</sup>**\
> KW_MACRO_RULES : `macro_rules`\
> KW_UNION : `union`\
> KW_STATICLIFETIME : `'static`\
> KW_SAFE : `safe`\
> KW_RAW : `raw`
>
> **<sup>Lexer 2015</sup>**\
> KW_DYN : `dyn`

* `macro_rules` is used to create custom [macros].
* `union` is used to declare a [union] and is only a keyword when used in a
union declaration.
Expand All @@ -116,15 +126,10 @@ is possible to declare a variable or method with the name `union`.

Beginning in the 2018 edition, `dyn` has been promoted to a strict keyword.

> **<sup>Lexer</sup>**\
> KW_MACRO_RULES : `macro_rules`\
> KW_UNION : `union`\
> KW_STATICLIFETIME : `'static`
>
> **<sup>Lexer 2015</sup>**\
> KW_DYN : `dyn`
* `safe` is used for functions and statics, which has meaning in [external blocks].

* `raw` is used for [raw borrow operators], and is only a keyword when matching a raw borrow operator form (such as `&raw const expr` or `&raw mut expr`).

[items]: items.md
[Variables]: variables.md
[Type parameters]: types/parameters.md
Expand All @@ -139,3 +144,4 @@ is possible to declare a variable or method with the name `union`.
[loop label]: expressions/loop-expr.md#loop-labels
[generic lifetime parameter]: items/generics.md
[external blocks]: items/external-blocks.md
[raw borrow operators]: expressions/operator-expr.md#raw-borrow-operators