From fc9eed4836dfc88fe2893c81b015ab440cea2ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Mon, 8 Mar 2021 22:19:44 +0200 Subject: Use upstream cov-mark --- crates/mbe/Cargo.toml | 1 + crates/mbe/src/lib.rs | 5 ++--- crates/mbe/src/tests.rs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/mbe') diff --git a/crates/mbe/Cargo.toml b/crates/mbe/Cargo.toml index bb2656a80..c7d5e39fa 100644 --- a/crates/mbe/Cargo.toml +++ b/crates/mbe/Cargo.toml @@ -10,6 +10,7 @@ edition = "2018" doctest = false [dependencies] +cov-mark = "1.1" rustc-hash = "1.1.0" smallvec = "1.2.0" log = "0.4.8" diff --git a/crates/mbe/src/lib.rs b/crates/mbe/src/lib.rs index f3d2da55a..33b85e23d 100644 --- a/crates/mbe/src/lib.rs +++ b/crates/mbe/src/lib.rs @@ -17,7 +17,6 @@ mod benchmark; use std::fmt; -use test_utils::mark; pub use tt::{Delimiter, DelimiterKind, Punct}; use crate::{ @@ -217,7 +216,7 @@ impl MacroDef { let mut rules = Vec::new(); if Some(tt::DelimiterKind::Brace) == tt.delimiter_kind() { - mark::hit!(parse_macro_def_rules); + cov_mark::hit!(parse_macro_def_rules); while src.len() > 0 { let rule = Rule::parse(&mut src, true)?; rules.push(rule); @@ -229,7 +228,7 @@ impl MacroDef { } } } else { - mark::hit!(parse_macro_def_simple); + cov_mark::hit!(parse_macro_def_simple); let rule = Rule::parse(&mut src, false)?; if src.len() != 0 { return Err(ParseError::Expected("remain tokens in macro def".to_string())); diff --git a/crates/mbe/src/tests.rs b/crates/mbe/src/tests.rs index 08acd4ac2..3a168bb4b 100644 --- a/crates/mbe/src/tests.rs +++ b/crates/mbe/src/tests.rs @@ -6,7 +6,7 @@ use syntax::{ SyntaxKind::{ERROR, IDENT}, SyntaxNode, WalkEvent, T, }; -use test_utils::{assert_eq_text, mark}; +use test_utils::assert_eq_text; use super::*; @@ -687,7 +687,7 @@ fn test_match_literal() { #[test] fn test_parse_macro_def_simple() { - mark::check!(parse_macro_def_simple); + cov_mark::check!(parse_macro_def_simple); parse_macro2( r#" @@ -701,7 +701,7 @@ macro foo($id:ident) { #[test] fn test_parse_macro_def_rules() { - mark::check!(parse_macro_def_rules); + cov_mark::check!(parse_macro_def_rules); parse_macro2( r#" -- cgit v1.2.3