aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/dev/README.md6
-rw-r--r--docs/dev/syntax.md2
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/dev/README.md b/docs/dev/README.md
index 67813a9c0..51cf716b3 100644
--- a/docs/dev/README.md
+++ b/docs/dev/README.md
@@ -256,9 +256,9 @@ Release steps:
256 * checkout the `release` branch 256 * checkout the `release` branch
257 * reset it to `upstream/nightly` 257 * reset it to `upstream/nightly`
258 * push it to `upstream`. This triggers GitHub Actions which: 258 * push it to `upstream`. This triggers GitHub Actions which:
259 ** runs `cargo xtask dist` to package binaries and VS Code extension 259 * runs `cargo xtask dist` to package binaries and VS Code extension
260 ** makes a GitHub release 260 * makes a GitHub release
261 ** pushes VS Code extension to the marketplace 261 * pushes VS Code extension to the marketplace
262 * create new changelog in `rust-analyzer.github.io` 262 * create new changelog in `rust-analyzer.github.io`
263 * create `rust-analyzer.github.io/git.log` file with the log of merge commits since last release 263 * create `rust-analyzer.github.io/git.log` file with the log of merge commits since last release
2642. While the release is in progress, fill-in the changelog using `git.log` 2642. While the release is in progress, fill-in the changelog using `git.log`
diff --git a/docs/dev/syntax.md b/docs/dev/syntax.md
index d4bc4b07c..f1bcdc4af 100644
--- a/docs/dev/syntax.md
+++ b/docs/dev/syntax.md
@@ -74,7 +74,7 @@ Points of note:
74* The original text can be recovered by concatenating the texts of all tokens in order. 74* The original text can be recovered by concatenating the texts of all tokens in order.
75* Accessing a child of particular type (for example, parameter list of a function) generally involves linerary traversing the children, looking for a specific `kind`. 75* Accessing a child of particular type (for example, parameter list of a function) generally involves linerary traversing the children, looking for a specific `kind`.
76* Modifying the tree is roughly `O(depth)`. 76* Modifying the tree is roughly `O(depth)`.
77 We don't make special efforts to guarantree that the depth is not liner, but, in practice, syntax trees are branchy and shallow. 77 We don't make special efforts to guarantee that the depth is not linear, but, in practice, syntax trees are branchy and shallow.
78* If mandatory (grammar wise) node is missing from the input, it's just missing from the tree. 78* If mandatory (grammar wise) node is missing from the input, it's just missing from the tree.
79* If an extra erroneous input is present, it is wrapped into a node with `ERROR` kind, and treated just like any other node. 79* If an extra erroneous input is present, it is wrapped into a node with `ERROR` kind, and treated just like any other node.
80* Parser errors are not a part of syntax tree. 80* Parser errors are not a part of syntax tree.