Update to Rust 2021 edition (#691)

* lib: Update to Rust 2021 edition * Replace pat with pat_param Following https://doc.rust-lang.org/edition-guide/rust-2021/or-patterns-macro-rules.html#migration guide * enums: Update to Rust 2021 edition * cli: Update to Rust 2021 edition * web: Update to Rust 2021 edition * Update grammars to Rust 2021 edition
mozilla · Oct 25, 2021 · fc11d8d · fc11d8d
1 parent 2ce9fa2
commit fc11d8d
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 115 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rust-code-analysis"
 version = "0.0.23"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/mozilla/rust-code-analysis"
 documentation = "https://docs.rs/rust-code-analysis/"
 readme = "README.md"

diff --git a/enums/Cargo.lock b/enums/Cargo.lock
diff --git a/enums/Cargo.toml b/enums/Cargo.toml
@@ -2,7 +2,7 @@
 name = "enums"
 version = "0.0.1"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 enum-iterator = "^0.7"

diff --git a/rust-code-analysis-cli/Cargo.toml b/rust-code-analysis-cli/Cargo.toml
@@ -3,7 +3,7 @@ name = "rust-code-analysis-cli"
 version = "0.0.23"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
 repository = "https://github.com/mozilla/rust-code-analysis/blob/master/rust-code-analysis-cli/"
-edition = "2018"
+edition = "2021"
 keywords = ["metrics"]
 description = "Tool to compute and export code metrics"
 license = "MPL-2.0"

diff --git a/rust-code-analysis-web/Cargo.toml b/rust-code-analysis-web/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rust-code-analysis-web"
 version = "0.0.23"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/mozilla/rust-code-analysis/tree/master/rust-code-analysis-web"
 keywords = ["metrics"]
 description = "Run a web service to compute and export code metrics"

diff --git a/src/asttools.rs b/src/asttools.rs
@@ -17,7 +17,7 @@ pub fn get_parent<'a>(node: &'a Node<'a>, level: usize) -> Option<Node<'a>> {
 }
 
 macro_rules! has_ancestors {
-    ($node:expr, $( $typs:pat )|*, $( $typ:pat ),+) => {{
+    ($node:expr, $( $typs:pat_param )|*, $( $typ:pat_param ),+) => {{
         let mut res = false;
         loop {
             let mut node = *$node;
@@ -54,7 +54,7 @@ macro_rules! has_ancestors {
 }
 
 macro_rules! count_specific_ancestors {
-    ($node:expr, $( $typs:pat )|*, $( $stops:pat )|*) => {{
+    ($node:expr, $( $typs:pat_param )|*, $( $stops:pat_param )|*) => {{
         let mut count = 0;
         let mut node = *$node;
         while let Some(parent) = node.object().parent() {

diff --git a/src/metrics/cognitive.rs b/src/metrics/cognitive.rs
@@ -92,7 +92,7 @@ where
 }
 
 macro_rules! compute_booleans {
-    ($node: ident, $stats: ident, $( $typs: pat )|*) => {
+    ($node: ident, $stats: ident, $( $typs: pat_param )|*) => {
         let mut cursor = $node.object().walk();
         for child in $node.object().children(&mut cursor) {
             if let $( $typs )|* = child.kind_id().into() {
@@ -105,9 +105,9 @@ macro_rules! compute_booleans {
 }
 
 macro_rules! nesting_levels {
-    ($node: ident, $stats: ident, [$nest_func: pat => $nest_func_stop: pat],
-     [$lambdas: pat => $( $lambdas_stop: pat )|*],
-     [$( $nest_level: pat )|* => $( $nest_level_stop: pat )|*]) => {
+    ($node: ident, $stats: ident, [$nest_func: pat_param => $nest_func_stop: pat_param],
+     [$lambdas: pat => $( $lambdas_stop: pat_param )|*],
+     [$( $nest_level: pat_param )|* => $( $nest_level_stop: pat_param )|*]) => {
         // Find the depth of a function (the most external function is
         // not considered)
         $stats.nesting = count_specific_ancestors!($node, $nest_func, $nest_func_stop).max(1) - 1;
@@ -129,8 +129,8 @@ macro_rules! nesting_levels {
         increment($stats);
     };
     ($node: ident, $stats: ident,
-     [$lambdas: pat => $( $lambdas_stop: pat )|*],
-     [$( $nest_level: pat )|* => $( $nest_level_stop: pat )|*]) => {
+     [$lambdas: pat_param => $( $lambdas_stop: pat_param )|*],
+     [$( $nest_level: pat_param )|* => $( $nest_level_stop: pat_param )|*]) => {
         // Find the depth of a lambda
         let lambda_depth = count_specific_ancestors!($node, $lambdas, $( $lambdas_stop )|*);
 

diff --git a/tree-sitter-ccomment/Cargo.toml b/tree-sitter-ccomment/Cargo.toml
@@ -8,7 +8,7 @@ readme = "bindings/rust/README.md"
 keywords = ["incremental", "parsing", "ccomment"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/mozilla/rust-code-analysis"
-edition = "2018"
+edition = "2021"
 
 build = "bindings/rust/build.rs"
 include = [

diff --git a/tree-sitter-mozcpp/Cargo.toml b/tree-sitter-mozcpp/Cargo.toml
@@ -8,7 +8,7 @@ readme = "bindings/rust/README.md"
 keywords = ["incremental", "parsing", "mozcpp"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/mozilla/rust-code-analysis"
-edition = "2018"
+edition = "2021"
 
 build = "bindings/rust/build.rs"
 include = [

diff --git a/tree-sitter-mozjs/Cargo.toml b/tree-sitter-mozjs/Cargo.toml
@@ -8,7 +8,7 @@ readme = "bindings/rust/README.md"
 keywords = ["incremental", "parsing", "mozjs"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/mozilla/rust-code-analysis"
-edition = "2018"
+edition = "2021"
 
 build = "bindings/rust/build.rs"
 include = [

diff --git a/tree-sitter-preproc/Cargo.toml b/tree-sitter-preproc/Cargo.toml
@@ -8,7 +8,7 @@ readme = "bindings/rust/README.md"
 keywords = ["incremental", "parsing", "preproc"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/mozilla/rust-code-analysis"
-edition = "2018"
+edition = "2021"
 
 build = "bindings/rust/build.rs"
 include = [