Auto merge of #17392 - randomicon00:17242, r=Veykril

bors · bors · commit a3ec3b9621de · 2024-06-11T13:14:56.000Z
Change 'Length' to 'Len' This is a fix for #17242
diff --git a/src/tools/rust-analyzer/crates/mbe/src/benchmark.rs b/src/tools/rust-analyzer/crates/mbe/src/benchmark.rs
@@ -215,7 +215,7 @@ fn invocation_fixtures(
 
                 token_trees.push(subtree.into());
             }
-            Op::Ignore { .. } | Op::Index { .. } | Op::Count { .. } | Op::Length { .. } => {}
+            Op::Ignore { .. } | Op::Index { .. } | Op::Count { .. } | Op::Len { .. } => {}
         };
 
         // Simple linear congruential generator for deterministic result
diff --git a/src/tools/rust-analyzer/crates/mbe/src/expander/matcher.rs b/src/tools/rust-analyzer/crates/mbe/src/expander/matcher.rs
@@ -566,7 +566,7 @@ fn match_loop_inner<'t>(
                 error_items.push(item);
             }
             OpDelimited::Op(
-                Op::Ignore { .. } | Op::Index { .. } | Op::Count { .. } | Op::Length { .. },
+                Op::Ignore { .. } | Op::Index { .. } | Op::Count { .. } | Op::Len { .. },
             ) => {
                 stdx::never!("metavariable expression in lhs found");
             }
@@ -832,7 +832,7 @@ fn collect_vars(collector_fun: &mut impl FnMut(SmolStr), pattern: &MetaTemplate)
             Op::Subtree { tokens, .. } => collect_vars(collector_fun, tokens),
             Op::Repeat { tokens, .. } => collect_vars(collector_fun, tokens),
             Op::Literal(_) | Op::Ident(_) | Op::Punct(_) => {}
-            Op::Ignore { .. } | Op::Index { .. } | Op::Count { .. } | Op::Length { .. } => {
+            Op::Ignore { .. } | Op::Index { .. } | Op::Count { .. } | Op::Len { .. } => {
                 stdx::never!("metavariable expression in lhs found");
             }
         }
diff --git a/src/tools/rust-analyzer/crates/mbe/src/expander/transcriber.rs b/src/tools/rust-analyzer/crates/mbe/src/expander/transcriber.rs
@@ -242,7 +242,7 @@ fn expand_subtree(
                     .into(),
                 );
             }
-            Op::Length { depth } => {
+            Op::Len { depth } => {
                 let length = ctx.nesting.get(ctx.nesting.len() - 1 - depth).map_or(0, |_nest| {
                     // FIXME: to be implemented
                     0
diff --git a/src/tools/rust-analyzer/crates/mbe/src/parser.rs b/src/tools/rust-analyzer/crates/mbe/src/parser.rs
@@ -75,7 +75,7 @@ pub(crate) enum Op {
     Index {
         depth: usize,
     },
-    Length {
+    Len {
         depth: usize,
     },
     Count {
@@ -345,7 +345,7 @@ fn parse_metavar_expr(new_meta_vars: bool, src: &mut TtIter<'_, Span>) -> Result
             Op::Ignore { name: ident.text.clone(), id: ident.span }
         }
         "index" => Op::Index { depth: parse_depth(&mut args)? },
-        "length" => Op::Length { depth: parse_depth(&mut args)? },
+        "len" => Op::Len { depth: parse_depth(&mut args)? },
         "count" => {
             if new_meta_vars {
                 args.expect_dollar()?;

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ fn invocation_fixtures(`
`215`	`215`
`216`	`216`	`token_trees.push(subtree.into());`
`217`	`217`	`}`
`218`		`- Op::Ignore { .. } \| Op::Index { .. } \| Op::Count { .. } \| Op::Length { .. } => {}`
	`218`	`+ Op::Ignore { .. } \| Op::Index { .. } \| Op::Count { .. } \| Op::Len { .. } => {}`
`219`	`219`	`};`
`220`	`220`
`221`	`221`	`// Simple linear congruential generator for deterministic result`
Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ fn match_loop_inner<'t>(`
`566`	`566`	`error_items.push(item);`
`567`	`567`	`}`
`568`	`568`	`OpDelimited::Op(`
`569`		`- Op::Ignore { .. } \| Op::Index { .. } \| Op::Count { .. } \| Op::Length { .. },`
	`569`	`+ Op::Ignore { .. } \| Op::Index { .. } \| Op::Count { .. } \| Op::Len { .. },`
`570`	`570`	`) => {`
`571`	`571`	`stdx::never!("metavariable expression in lhs found");`
`572`	`572`	`}`
`@@ -832,7 +832,7 @@ fn collect_vars(collector_fun: &mut impl FnMut(SmolStr), pattern: &MetaTemplate)`
`832`	`832`	`Op::Subtree { tokens, .. } => collect_vars(collector_fun, tokens),`
`833`	`833`	`Op::Repeat { tokens, .. } => collect_vars(collector_fun, tokens),`
`834`	`834`	`Op::Literal(_) \| Op::Ident(_) \| Op::Punct(_) => {}`
`835`		`- Op::Ignore { .. } \| Op::Index { .. } \| Op::Count { .. } \| Op::Length { .. } => {`
	`835`	`+ Op::Ignore { .. } \| Op::Index { .. } \| Op::Count { .. } \| Op::Len { .. } => {`
`836`	`836`	`stdx::never!("metavariable expression in lhs found");`
`837`	`837`	`}`
`838`	`838`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ fn expand_subtree(`
`242`	`242`	`.into(),`
`243`	`243`	`);`
`244`	`244`	`}`
`245`		`- Op::Length { depth } => {`
	`245`	`+ Op::Len { depth } => {`
`246`	`246`	`let length = ctx.nesting.get(ctx.nesting.len() - 1 - depth).map_or(0, \|_nest\| {`
`247`	`247`	`// FIXME: to be implemented`
`248`	`248`	`0`