diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-01-17 02:20:16 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-01-17 02:20:16 +0000 |
commit | ea2b27d8b978fbe2307991ff28d6030eabf5b82c (patch) | |
tree | df680c230b771c9c57c181033927e57f10c48fb2 | |
parent | 040478834fe9f871ef2fd8346635c8d74f5d80da (diff) | |
parent | ecf3b3c9a1e9cd6a91412f0723a3107e65f92b91 (diff) |
Merge #2865
2865: fix(mixed): fixed a couple of typos and added a todo r=kjeremy a=Veetaha
Fixed a couple of typos and added a todo while studying the codebase.
Co-authored-by: Veetaha <[email protected]>
-rw-r--r-- | crates/ra_parser/src/grammar.rs | 2 | ||||
-rw-r--r-- | xtask/src/codegen/gen_syntax.rs | 2 | ||||
-rw-r--r-- | xtask/src/lib.rs | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs index 22f64a9f4..a46e11e1d 100644 --- a/crates/ra_parser/src/grammar.rs +++ b/crates/ra_parser/src/grammar.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | //! This is the actual "grammar" of the Rust language. | 1 | //! This is the actual "grammar" of the Rust language. |
2 | //! | 2 | //! |
3 | //! Each function in this module and its children corresponds | 3 | //! Each function in this module and its children corresponds |
4 | //! to a production of the format grammar. Submodules roughly | 4 | //! to a production of the formal grammar. Submodules roughly |
5 | //! correspond to different *areas* of the grammar. By convention, | 5 | //! correspond to different *areas* of the grammar. By convention, |
6 | //! each submodule starts with `use super::*` import and exports | 6 | //! each submodule starts with `use super::*` import and exports |
7 | //! "public" productions via `pub(super)`. | 7 | //! "public" productions via `pub(super)`. |
diff --git a/xtask/src/codegen/gen_syntax.rs b/xtask/src/codegen/gen_syntax.rs index 19fea67d8..db05dcebb 100644 --- a/xtask/src/codegen/gen_syntax.rs +++ b/xtask/src/codegen/gen_syntax.rs | |||
@@ -1,4 +1,4 @@ | |||
1 | //! This module generate AST datatype used by rust-analyzer. | 1 | //! This module generates AST datatype used by rust-analyzer. |
2 | //! | 2 | //! |
3 | //! Specifically, it generates the `SyntaxKind` enum and a number of newtype | 3 | //! Specifically, it generates the `SyntaxKind` enum and a number of newtype |
4 | //! wrappers around `SyntaxNode` which implement `ra_syntax::AstNode`. | 4 | //! wrappers around `SyntaxNode` which implement `ra_syntax::AstNode`. |
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs index 0a569cf5d..9b0afe8e0 100644 --- a/xtask/src/lib.rs +++ b/xtask/src/lib.rs | |||
@@ -53,6 +53,7 @@ fn reformat(text: impl std::fmt::Display) -> Result<String> { | |||
53 | write!(rustfmt.stdin.take().unwrap(), "{}", text)?; | 53 | write!(rustfmt.stdin.take().unwrap(), "{}", text)?; |
54 | let output = rustfmt.wait_with_output()?; | 54 | let output = rustfmt.wait_with_output()?; |
55 | let stdout = String::from_utf8(output.stdout)?; | 55 | let stdout = String::from_utf8(output.stdout)?; |
56 | // TODO: update the preable: replace ra_tools with the relevant path | ||
56 | let preamble = "Generated file, do not edit by hand, see `crate/ra_tools/src/codegen`"; | 57 | let preamble = "Generated file, do not edit by hand, see `crate/ra_tools/src/codegen`"; |
57 | Ok(format!("//! {}\n\n{}", preamble, stdout)) | 58 | Ok(format!("//! {}\n\n{}", preamble, stdout)) |
58 | } | 59 | } |