From 74570f74221b0654ec57417a9b9b1d240a1b1a35 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sat, 3 Oct 2020 19:25:43 +0900 Subject: [PATCH] Rename auxiliary-macros to pin-project-auxiliary-macro --- Cargo.toml | 2 +- tests/ui/auxiliary/Cargo.toml | 5 +++-- tests/ui/cfg/packed_sneaky-span-issue-1.rs | 2 +- tests/ui/cfg/packed_sneaky-span-issue-2.rs | 2 +- tests/ui/cfg/packed_sneaky.rs | 2 +- tests/ui/pin_project/add-attr-to-struct.rs | 2 +- tests/ui/pin_project/add-pinned-field.rs | 2 +- tests/ui/pin_project/packed_sneaky-1.rs | 2 +- tests/ui/pin_project/packed_sneaky-2.rs | 2 +- tests/ui/pin_project/remove-attr-from-field.rs | 2 +- tests/ui/pin_project/remove-attr-from-struct.rs | 2 +- 11 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a6d9b0bf..ec0e61f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,6 +32,6 @@ members = [ pin-project-internal = { version = "=0.4.25", path = "pin-project-internal", default-features = false } [dev-dependencies] -auxiliary-macros = { version = "0.1", path = "tests/ui/auxiliary" } +pin-project-auxiliary-macro = { version = "0", path = "tests/ui/auxiliary" } rustversion = "1.0" trybuild = "1.0" diff --git a/tests/ui/auxiliary/Cargo.toml b/tests/ui/auxiliary/Cargo.toml index a874359d..814d6d8d 100644 --- a/tests/ui/auxiliary/Cargo.toml +++ b/tests/ui/auxiliary/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "auxiliary-macros" -version = "0.1.0" +name = "pin-project-auxiliary-macro" +version = "0.0.0" authors = ["Taiki Endo "] edition = "2018" publish = false @@ -8,6 +8,7 @@ publish = false [lib] path = "lib.rs" proc-macro = true +name = "auxiliary_macro" [dependencies] quote = "1.0" diff --git a/tests/ui/cfg/packed_sneaky-span-issue-1.rs b/tests/ui/cfg/packed_sneaky-span-issue-1.rs index 3776dac3..e0775d79 100644 --- a/tests/ui/cfg/packed_sneaky-span-issue-1.rs +++ b/tests/ui/cfg/packed_sneaky-span-issue-1.rs @@ -1,4 +1,4 @@ -use auxiliary_macros::hidden_repr; +use auxiliary_macro::hidden_repr; use pin_project::pin_project; //~ ERROR may not be used on #[repr(packed)] types diff --git a/tests/ui/cfg/packed_sneaky-span-issue-2.rs b/tests/ui/cfg/packed_sneaky-span-issue-2.rs index aa65d331..40eceaab 100644 --- a/tests/ui/cfg/packed_sneaky-span-issue-2.rs +++ b/tests/ui/cfg/packed_sneaky-span-issue-2.rs @@ -1,4 +1,4 @@ -use auxiliary_macros::hidden_repr; +use auxiliary_macro::hidden_repr; use pin_project::pin_project; //~ ERROR may not be used on #[repr(packed)] types diff --git a/tests/ui/cfg/packed_sneaky.rs b/tests/ui/cfg/packed_sneaky.rs index 3305ed39..ab98b065 100644 --- a/tests/ui/cfg/packed_sneaky.rs +++ b/tests/ui/cfg/packed_sneaky.rs @@ -1,4 +1,4 @@ -use auxiliary_macros::hidden_repr_cfg_not_any; +use auxiliary_macro::hidden_repr_cfg_not_any; use pin_project::pin_project; // `#[hidden_repr_cfg_not_any(packed)]` generates `#[cfg_attr(not(any()), repr(packed))]`. diff --git a/tests/ui/pin_project/add-attr-to-struct.rs b/tests/ui/pin_project/add-attr-to-struct.rs index f5364fc8..aea2cbff 100644 --- a/tests/ui/pin_project/add-attr-to-struct.rs +++ b/tests/ui/pin_project/add-attr-to-struct.rs @@ -1,4 +1,4 @@ -use auxiliary_macros::add_pin_attr; +use auxiliary_macro::add_pin_attr; use pin_project::pin_project; use std::marker::PhantomPinned; diff --git a/tests/ui/pin_project/add-pinned-field.rs b/tests/ui/pin_project/add-pinned-field.rs index 76394cf5..c4e1e3ba 100644 --- a/tests/ui/pin_project/add-pinned-field.rs +++ b/tests/ui/pin_project/add-pinned-field.rs @@ -1,4 +1,4 @@ -use auxiliary_macros::add_pinned_field; +use auxiliary_macro::add_pinned_field; use pin_project::pin_project; fn is_unpin() {} diff --git a/tests/ui/pin_project/packed_sneaky-1.rs b/tests/ui/pin_project/packed_sneaky-1.rs index dcf5464e..d7b7f2b4 100644 --- a/tests/ui/pin_project/packed_sneaky-1.rs +++ b/tests/ui/pin_project/packed_sneaky-1.rs @@ -1,4 +1,4 @@ -use auxiliary_macros::hidden_repr; +use auxiliary_macro::hidden_repr; use pin_project::{pin_project, pinned_drop, UnsafeUnpin}; use std::pin::Pin; diff --git a/tests/ui/pin_project/packed_sneaky-2.rs b/tests/ui/pin_project/packed_sneaky-2.rs index d1627063..9627f58f 100644 --- a/tests/ui/pin_project/packed_sneaky-2.rs +++ b/tests/ui/pin_project/packed_sneaky-2.rs @@ -1,4 +1,4 @@ -use auxiliary_macros::hidden_repr_macro; +use auxiliary_macro::hidden_repr_macro; use pin_project::pin_project; hidden_repr_macro! { //~ ERROR may not be used on #[repr(packed)] types diff --git a/tests/ui/pin_project/remove-attr-from-field.rs b/tests/ui/pin_project/remove-attr-from-field.rs index 1ecd56f3..88a0b16e 100644 --- a/tests/ui/pin_project/remove-attr-from-field.rs +++ b/tests/ui/pin_project/remove-attr-from-field.rs @@ -1,4 +1,4 @@ -use auxiliary_macros::remove_attr; +use auxiliary_macro::remove_attr; use pin_project::pin_project; use std::{marker::PhantomPinned, pin::Pin}; diff --git a/tests/ui/pin_project/remove-attr-from-struct.rs b/tests/ui/pin_project/remove-attr-from-struct.rs index 0c7af63a..e7c07f2c 100644 --- a/tests/ui/pin_project/remove-attr-from-struct.rs +++ b/tests/ui/pin_project/remove-attr-from-struct.rs @@ -1,4 +1,4 @@ -use auxiliary_macros::remove_attr; +use auxiliary_macro::remove_attr; use pin_project::pin_project; use std::{marker::PhantomPinned, pin::Pin};