Skip to content

Commit

Permalink
Remove expr_2021
Browse files Browse the repository at this point in the history
  • Loading branch information
@GearsDatapacks @lpil
GearsDatapacks authored and lpil committed Feb 27, 2025
1 parent a7aa466 commit 8d19869
Show file tree
Hide file tree
Showing 16 changed files with 75 additions and 75 deletions.
4 changes: 2 additions & 2 deletions compiler-core/src/erlang/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ pub fn compile_test_project(src: &str, src_path: &str, dep: Option<(&str, &str,

#[macro_export]
macro_rules! assert_erl {
(($dep_package:expr_2021, $dep_name:expr_2021, $dep_src:expr_2021), $src:expr_2021 $(,)?) => {{
(($dep_package:expr, $dep_name:expr, $dep_src:expr), $src:expr $(,)?) => {{
let compiled = $crate::erlang::tests::compile_test_project(
$src,
"/root/project/test/my/mod.gleam",
Expand All @@ -135,7 +135,7 @@ macro_rules! assert_erl {
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
}};

($src:expr_2021 $(,)?) => {{
($src:expr $(,)?) => {{
let compiled = $crate::erlang::tests::compile_test_project(
$src,
"/root/project/test/my/mod.gleam",
Expand Down
4 changes: 2 additions & 2 deletions compiler-core/src/format/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ mod use_;

#[macro_export]
macro_rules! assert_format {
($src:expr_2021 $(,)?) => {
($src:expr $(,)?) => {
let mut writer = String::new();
$crate::format::pretty(&mut writer, &$src.into(), camino::Utf8Path::new("<stdin>"))
.unwrap();
Expand All @@ -29,7 +29,7 @@ macro_rules! assert_format {

#[macro_export]
macro_rules! assert_format_rewrite {
($src:expr_2021, $expected:expr_2021 $(,)?) => {
($src:expr, $expected:expr $(,)?) => {
let mut writer = String::new();
$crate::format::pretty(&mut writer, &$src.into(), camino::Utf8Path::new("<stdin>"))
.unwrap();
Expand Down
16 changes: 8 additions & 8 deletions compiler-core/src/javascript/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ macro_rules! assert_js_with_multiple_imports {

#[macro_export]
macro_rules! assert_js {
(($dep_package:expr_2021, $dep_name:expr_2021, $dep_src:expr_2021), $src:expr_2021 $(,)?) => {{
(($dep_package:expr, $dep_name:expr, $dep_src:expr), $src:expr $(,)?) => {{
let compiled =
$crate::javascript::tests::compile_js($src, vec![($dep_package, $dep_name, $dep_src)])
.expect("compilation failed");
Expand All @@ -62,14 +62,14 @@ macro_rules! assert_js {
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
}};

(($dep_package:expr_2021, $dep_name:expr_2021, $dep_src:expr_2021), $src:expr_2021, $js:expr_2021 $(,)?) => {{
(($dep_package:expr, $dep_name:expr, $dep_src:expr), $src:expr, $js:expr $(,)?) => {{
let output =
$crate::javascript::tests::compile_js($src, Some(($dep_package, $dep_name, $dep_src)))
.expect("compilation failed");
assert_eq!(($src, output), ($src, $js.to_string()));
}};

($src:expr_2021 $(,)?) => {{
($src:expr $(,)?) => {{
let compiled =
$crate::javascript::tests::compile_js($src, vec![]).expect("compilation failed");
let output = format!(
Expand All @@ -79,7 +79,7 @@ macro_rules! assert_js {
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
}};

($src:expr_2021, $js:expr_2021 $(,)?) => {{
($src:expr, $js:expr $(,)?) => {{
let output =
$crate::javascript::tests::compile_js($src, vec![]).expect("compilation failed");
assert_eq!(($src, output), ($src, $js.to_string()));
Expand All @@ -88,7 +88,7 @@ macro_rules! assert_js {

#[macro_export]
macro_rules! assert_js_error {
($src:expr_2021 $(,)?) => {{
($src:expr $(,)?) => {{
let error = $crate::javascript::tests::expect_js_error($src, vec![]);
let output = format!("----- SOURCE CODE\n{}\n\n----- ERROR\n{}", $src, error);
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
Expand All @@ -97,7 +97,7 @@ macro_rules! assert_js_error {

#[macro_export]
macro_rules! assert_ts_def {
(($dep_1_package:expr_2021, $dep_1_name:expr_2021, $dep_1_src:expr_2021), ($dep_2_package:expr_2021, $dep_2_name:expr_2021, $dep_2_src:expr_2021), $src:expr_2021 $(,)?) => {{
(($dep_1_package:expr, $dep_1_name:expr, $dep_1_src:expr), ($dep_2_package:expr, $dep_2_name:expr, $dep_2_src:expr), $src:expr $(,)?) => {{
let compiled = $crate::javascript::tests::compile_ts(
$src,
vec![
Expand All @@ -113,7 +113,7 @@ macro_rules! assert_ts_def {
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
}};

(($dep_package:expr_2021, $dep_name:expr_2021, $dep_src:expr_2021), $src:expr_2021 $(,)?) => {{
(($dep_package:expr, $dep_name:expr, $dep_src:expr), $src:expr $(,)?) => {{
let compiled =
$crate::javascript::tests::compile_ts($src, vec![($dep_package, $dep_name, $dep_src)])
.expect("compilation failed");
Expand All @@ -124,7 +124,7 @@ macro_rules! assert_ts_def {
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
}};

($src:expr_2021 $(,)?) => {{
($src:expr $(,)?) => {{
let compiled =
$crate::javascript::tests::compile_ts($src, vec![]).expect("compilation failed");
let output = format!(
Expand Down
8 changes: 4 additions & 4 deletions compiler-core/src/language_server/tests/action.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ const CONVERT_TO_PIPE: &str = "Convert to pipe";
const INTERPOLATE_STRING: &str = "Interpolate string";

macro_rules! assert_code_action {
($title:expr_2021, $code:literal, $range:expr_2021 $(,)?) => {
($title:expr, $code:literal, $range:expr $(,)?) => {
let project = TestProject::for_source($code);
assert_code_action!($title, project, $range);
};

($title:expr_2021, $project:expr_2021, $range:expr_2021 $(,)?) => {
($title:expr, $project:expr, $range:expr $(,)?) => {
let src = $project.src;
let range = $range.find_range(src);
let result = apply_code_action($title, $project, range);
Expand All @@ -100,12 +100,12 @@ macro_rules! assert_code_action {
}

macro_rules! assert_no_code_actions {
($title:ident $(| $titles:ident)*, $code:literal, $range:expr_2021 $(,)?) => {
($title:ident $(| $titles:ident)*, $code:literal, $range:expr $(,)?) => {
let project = TestProject::for_source($code);
assert_no_code_actions!($title $(| $titles)*, project, $range);
};

($title:ident $(| $titles:ident)*, $project:expr_2021, $range:expr_2021 $(,)?) => {
($title:ident $(| $titles:ident)*, $project:expr, $range:expr $(,)?) => {
let src = $project.src;
let range = $range.find_range(src);
let all_titles = vec![$title $(, $titles)*];
Expand Down
8 changes: 4 additions & 4 deletions compiler-core/src/language_server/tests/completion.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fn apply_conversion(src: &str, completions: Vec<CompletionItem>, value: &str) ->

#[macro_export]
macro_rules! assert_apply_completion {
($project:expr_2021, $name:literal, $position:expr_2021) => {
($project:expr, $name:literal, $position:expr) => {
let src = $project.src;
let completions = completion($project, $position);
let output = format!(
Expand All @@ -51,7 +51,7 @@ macro_rules! assert_apply_completion {

#[macro_export]
macro_rules! assert_completion {
($project:expr_2021) => {
($project:expr) => {
let src = $project.src;
let result = completion_with_prefix($project, "");
let output = format!(
Expand All @@ -61,7 +61,7 @@ macro_rules! assert_completion {
);
insta::assert_snapshot!(insta::internals::AutoName, output, src);
};
($project:expr_2021, $position:expr_2021) => {
($project:expr, $position:expr) => {
let src = $project.src;
let result = completion($project, $position);
let output = format!(
Expand All @@ -75,7 +75,7 @@ macro_rules! assert_completion {

#[macro_export]
macro_rules! assert_completion_with_prefix {
($project:expr_2021, $prefix:expr_2021) => {
($project:expr, $prefix:expr) => {
let src = $project.src;
let result = completion_with_prefix($project, $prefix);
let line = 1 + $prefix.lines().count();
Expand Down
8 changes: 4 additions & 4 deletions compiler-core/src/language_server/tests/definition.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,23 +94,23 @@ fn jump_locations_to_string(

#[macro_export]
macro_rules! assert_goto {
($src:literal, $position:expr_2021) => {
($src:literal, $position:expr) => {
let project = TestProject::for_source($src);
assert_goto!(project, $position);
};
($project:expr_2021, $position:expr_2021) => {
($project:expr, $position:expr) => {
let output = pretty_definition($project, $position);
insta::assert_snapshot!(insta::internals::AutoName, output);
};
}

#[macro_export]
macro_rules! assert_goto_type {
($src:literal, $position:expr_2021) => {
($src:literal, $position:expr) => {
let project = TestProject::for_source($src);
assert_goto_type!(project, $position);
};
($project:expr_2021, $position:expr_2021) => {
($project:expr, $position:expr) => {
let output = pretty_type_definition($project, $position);
insta::assert_snapshot!(insta::internals::AutoName, output);
};
Expand Down
4 changes: 2 additions & 2 deletions compiler-core/src/language_server/tests/hover.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ pub fn show_hover(code: &str, range: Range, position: Position) -> String {

#[macro_export]
macro_rules! assert_hover {
($code:literal, $position:expr_2021 $(,)?) => {
($code:literal, $position:expr $(,)?) => {
let project = TestProject::for_source($code);
assert_hover!(project, $position);
};

($project:expr_2021, $position:expr_2021 $(,)?) => {
($project:expr, $position:expr $(,)?) => {
let src = $project.src;
let position = $position.find_position(src);
let result = hover($project, position).expect("no hover produced");
Expand Down
8 changes: 4 additions & 4 deletions compiler-core/src/language_server/tests/rename.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ fn apply_code_edit(src: &str, changes: HashMap<Url, Vec<lsp_types::TextEdit>>) -
}

macro_rules! assert_rename {
($code:literal, $new_name:literal, $range:expr_2021 $(,)?) => {
($code:literal, $new_name:literal, $range:expr $(,)?) => {
let project = TestProject::for_source($code);
assert_rename!(project, $new_name, $range);
};

($project:expr_2021, $new_name:literal, $range:expr_2021 $(,)?) => {
($project:expr, $new_name:literal, $range:expr $(,)?) => {
let src = $project.src;
let range = $range.find_range(src);
let result = apply_rename($project, $new_name, range.start);
Expand All @@ -69,12 +69,12 @@ macro_rules! assert_rename {
}

macro_rules! assert_no_rename {
($code:literal, $new_name:literal, $range:expr_2021 $(,)?) => {
($code:literal, $new_name:literal, $range:expr $(,)?) => {
let project = TestProject::for_source($code);
assert_no_rename!(project, $new_name, $range);
};

($project:expr_2021, $new_name:literal, $range:expr_2021 $(,)?) => {
($project:expr, $new_name:literal, $range:expr $(,)?) => {
let src = $project.src;
let range = $range.find_range(src);
let result = rename($project, $new_name, range.start);
Expand Down
8 changes: 4 additions & 4 deletions compiler-core/src/language_server/tests/signature_help.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ fn pretty_signature_help(signature_help: SignatureHelp) -> String {

#[macro_export]
macro_rules! assert_signature_help {
($code:literal, $position:expr_2021 $(,)?) => {
($code:literal, $position:expr $(,)?) => {
let project = TestProject::for_source($code);
assert_signature_help!(project, $position);
};

($project:expr_2021, $position:expr_2021 $(,)?) => {
($project:expr, $position:expr $(,)?) => {
let src = $project.src;
let position = $position.find_position(src);
let result = signature_help($project, position).expect("no signature help produced");
Expand Down Expand Up @@ -96,12 +96,12 @@ macro_rules! assert_signature_help {

#[macro_export]
macro_rules! assert_no_signature_help {
($code:literal, $position:expr_2021 $(,)?) => {
($code:literal, $position:expr $(,)?) => {
let project = TestProject::for_source($code);
assert_no_signature_help!(project, $position);
};

($project:expr_2021, $position:expr_2021 $(,)?) => {
($project:expr, $position:expr $(,)?) => {
let src = $project.src;
let position = $position.find_position(src);
let result = signature_help($project, position);
Expand Down
4 changes: 2 additions & 2 deletions compiler-core/src/metadata/module_decoder.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use crate::{
use std::{collections::HashMap, io::BufRead, sync::Arc};

macro_rules! read_vec {
($reader:expr_2021, $self:expr_2021, $method:ident) => {{
($reader:expr, $self:expr, $method:ident) => {{
let reader = $reader;
let mut vec = Vec::with_capacity(reader.len() as usize);
for reader in reader.into_iter() {
Expand All @@ -35,7 +35,7 @@ macro_rules! read_vec {
}

macro_rules! read_hashmap {
($reader:expr_2021, $self:expr_2021, $method:ident) => {{
($reader:expr, $self:expr, $method:ident) => {{
let reader = $reader;
let mut map = HashMap::with_capacity(reader.len() as usize);
for prop in reader.into_iter() {
Expand Down
8 changes: 4 additions & 4 deletions compiler-core/src/package_interface/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use super::PackageInterface;

#[macro_export]
macro_rules! assert_package_interface_with_name {
($module_name:expr_2021, $src:expr_2021) => {
($module_name:expr, $src:expr) => {
let output =
$crate::package_interface::tests::compile_package(Some($module_name), $src, None);
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
Expand All @@ -28,7 +28,7 @@ macro_rules! assert_package_interface_with_name {

#[macro_export]
macro_rules! assert_package_interface {
(($dep_package:expr_2021, $dep_name:expr_2021, $dep_src:expr_2021), $src:expr_2021 $(,)?) => {{
(($dep_package:expr, $dep_name:expr, $dep_src:expr), $src:expr $(,)?) => {{
let output = $crate::package_interface::tests::compile_package(
None,
$src,
Expand All @@ -37,7 +37,7 @@ macro_rules! assert_package_interface {
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
}};

(($dep_package:expr_2021, $dep_name:expr_2021, $dep_src:expr_2021), $src:expr_2021 $(,)?) => {{
(($dep_package:expr, $dep_name:expr, $dep_src:expr), $src:expr $(,)?) => {{
let output = $crate::package_interface::tests::compile_package(
None,
$src,
Expand All @@ -46,7 +46,7 @@ macro_rules! assert_package_interface {
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
}};

($src:expr_2021) => {{
($src:expr) => {{
let output = $crate::package_interface::tests::compile_package(None, $src, None);
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
}};
Expand Down
10 changes: 5 additions & 5 deletions compiler-core/src/parse/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ use itertools::Itertools;
use pretty_assertions::assert_eq;

macro_rules! assert_error {
($src:expr_2021, $error:expr_2021 $(,)?) => {
($src:expr, $error:expr $(,)?) => {
let result = crate::parse::parse_statement_sequence($src).expect_err("should not parse");
assert_eq!(($src, $error), ($src, result),);
};
($src:expr_2021) => {
($src:expr) => {
let error = $crate::parse::tests::expect_error($src);
let output = format!("----- SOURCE CODE\n{}\n\n----- ERROR\n{}", $src, error);
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
};
}

macro_rules! assert_module_error {
($src:expr_2021) => {
($src:expr) => {
let error = $crate::parse::tests::expect_module_error($src);
let output = format!("----- SOURCE CODE\n{}\n\n----- ERROR\n{}", $src, error);
insta::assert_snapshot!(insta::internals::AutoName, output, $src);
};
}

macro_rules! assert_parse_module {
($src:expr_2021) => {
($src:expr) => {
let result = crate::parse::parse_module(
camino::Utf8PathBuf::from("test/path"),
$src,
Expand All @@ -44,7 +44,7 @@ macro_rules! assert_parse_module {
}

macro_rules! assert_parse {
($src:expr_2021) => {
($src:expr) => {
let result = crate::parse::parse_statement_sequence($src).expect("should parse");
insta::assert_snapshot!(insta::internals::AutoName, &format!("{:#?}", result), $src);
};
Expand Down
2 changes: 1 addition & 1 deletion compiler-core/src/pretty.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ macro_rules! docvec {
Document::Vec(Vec::new())
};

($($x:expr_2021),+ $(,)?) => {
($($x:expr),+ $(,)?) => {
Document::Vec(vec![$($x.to_doc()),+])
};
}
Expand Down
2 changes: 1 addition & 1 deletion compiler-core/src/type_/pretty.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ fn next_letter_test() {
#[test]
fn pretty_print_test() {
macro_rules! assert_string {
($src:expr_2021, $type_:expr_2021 $(,)?) => {
($src:expr, $type_:expr $(,)?) => {
let mut printer = Printer::new();
assert_eq!($type_.to_string(), printer.pretty_print(&$src, 0),);
};
Expand Down
Loading

0 comments on commit 8d19869

Please sign in to comment.