From 75e1bcf70a0a3de5ff32bc2b6672bfc6d1033207 Mon Sep 17 00:00:00 2001 From: Amaan Qureshi Date: Wed, 19 Jul 2023 22:19:43 -0400 Subject: [PATCH] refactor!: rename proc_macro to avoid conflicts when building std with `-Z build-std` --- cli/Cargo.toml | 2 +- cli/src/tests/corpus_test.rs | 2 +- cli/src/tests/parser_test.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index c50a29ed..7bc2e2ea 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -72,7 +72,7 @@ version = "0.4.19" features = ["std"] [dev-dependencies] -proc_macro = { path = "src/tests/proc_macro", package = "tree-sitter-tests-proc-macro" } +tree_sitter_proc_macro = { path = "src/tests/proc_macro", package = "tree-sitter-tests-proc-macro" } rand = "0.8.5" tempfile = "3.6.0" diff --git a/cli/src/tests/corpus_test.rs b/cli/src/tests/corpus_test.rs index 0bd1db88..7166d249 100644 --- a/cli/src/tests/corpus_test.rs +++ b/cli/src/tests/corpus_test.rs @@ -14,9 +14,9 @@ use crate::{ test::{parse_tests, print_diff, print_diff_key, strip_sexp_fields, TestEntry}, util, }; -use proc_macro::test_with_seed; use std::{env, fs}; use tree_sitter::{LogType, Node, Parser, Point, Range, Tree}; +use tree_sitter_proc_macro::test_with_seed; #[test_with_seed(retry=10, seed=*START_SEED, seed_fn=new_seed)] fn test_corpus_for_bash(seed: usize) { diff --git a/cli/src/tests/parser_test.rs b/cli/src/tests/parser_test.rs index af5f36f5..01063359 100644 --- a/cli/src/tests/parser_test.rs +++ b/cli/src/tests/parser_test.rs @@ -8,12 +8,12 @@ use crate::{ generate::generate_parser_for_grammar, parse::{perform_edit, Edit}, }; -use proc_macro::retry; use std::{ sync::atomic::{AtomicUsize, Ordering}, thread, time, }; use tree_sitter::{IncludedRangesError, InputEdit, LogType, Parser, Point, Range}; +use tree_sitter_proc_macro::retry; #[test] fn test_parsing_simple_string() {