Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

[workspace]
members = ["visitor", "visitor-derive", "xtask"]
members = ["traversable", "traversable-derive", "xtask"]
resolver = "2"

[workspace.package]
Expand All @@ -25,7 +25,7 @@ repository = "https://github.com/fast/visitor"
rust-version = "1.85.0"

[workspace.dependencies]
visitor-derive = { version = "0.1.0", path = "visitor-derive" }
traversable-derive = { version = "0.1.0", path = "traversable-derive" }

[workspace.lints.rust]
unknown_lints = "deny"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

[package]
name = "visitor-derive"
name = "traversable-derive"
version = "0.1.0"

edition.workspace = true
Expand Down
12 changes: 6 additions & 6 deletions visitor-derive/src/lib.rs → traversable-derive/src/lib.rs
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may factor out crate name retrieval to a function.

There is https://crates.io/crates/proc-macro-crate but I'm not sure if it's reliable.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,15 @@ fn impl_traversable(input: DeriveInput, mutable: bool) -> Result<TokenStream> {
None
} else {
Some(quote! {
::visitor::#visitor::#enter_method(visitor, self)?;
::traversable::#visitor::#enter_method(visitor, self)?;
})
};

let leave_self = if skip_visit_self {
None
} else {
Some(quote! {
::visitor::#visitor::#leave_method(visitor, self)?;
::traversable::#visitor::#leave_method(visitor, self)?;
})
};

Expand Down Expand Up @@ -274,8 +274,8 @@ fn impl_traversable(input: DeriveInput, mutable: bool) -> Result<TokenStream> {
};

Ok(quote! {
impl #impl_generics ::visitor::#impl_trait for #name #ty_generics #where_clause {
fn #method<V: ::visitor::#visitor>(
impl #impl_generics ::traversable::#impl_trait for #name #ty_generics #where_clause {
fn #method<V: ::traversable::#visitor>(
& #mut_modifier self,
visitor: &mut V
) -> ::core::ops::ControlFlow<V::Break> {
Expand Down Expand Up @@ -405,9 +405,9 @@ fn traverse_field(value: &TokenStream, field: Field, mutable: bool) -> Result<To
let traverse_fn = params.param("with")?.map_or_else(
|| {
parse_str(if mutable {
"::visitor::TraversableMut::traverse_mut"
"::traversable::TraversableMut::traverse_mut"
} else {
"::visitor::Traversable::traverse"
"::traversable::Traversable::traverse"
})
},
|param| param.string_literal()?.parse::<Path>(),
Expand Down
6 changes: 3 additions & 3 deletions visitor/Cargo.toml → traversable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

[package]
name = "visitor"
name = "traversable"
version = "0.1.0"

edition.workspace = true
Expand All @@ -25,7 +25,7 @@ rust-version.workspace = true

[features]
default = []
derive = ["visitor-derive"]
derive = ["dep:traversable-derive"]

# Implement Traversal for standard library types.
std = []
Expand All @@ -52,7 +52,7 @@ ordered-float-5 = ["dep:ordered-float-5"]
stacksafe-01 = ["dep:stacksafe-01"]

[dependencies]
visitor-derive = { workspace = true, optional = true }
traversable-derive = { workspace = true, optional = true }

# Optional dependencies for third-party library support
ordered-float-5 = { version = "5.1", default-features = false, optional = true, package = "ordered-float" }
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions visitor/src/lib.rs → traversable/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ use core::ops::ControlFlow;

#[cfg(feature = "derive")]
/// See [`Traversable`].
pub use visitor_derive::Traversable;
pub use traversable_derive::Traversable;
#[cfg(feature = "derive")]
/// See [`TraversableMut`].
pub use visitor_derive::TraversableMut;
pub use traversable_derive::TraversableMut;

pub mod function;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@

use core::ops::ControlFlow;

use visitor::Traversable;
use visitor::TraversableMut;
use traversable::Traversable;
use traversable::TraversableMut;
use traversable::function::make_visitor_enter;
use traversable::function::make_visitor_leave_mut;

#[test]
fn test_make_visitor() {
let mut visitor = visitor::function::make_visitor_enter::<i32, (), _>(|item| {
let mut visitor = make_visitor_enter::<i32, (), _>(|item| {
assert_eq!(*item, 42);
ControlFlow::Continue(())
});
Expand All @@ -32,7 +34,7 @@ fn test_make_visitor() {

#[test]
fn test_make_visitor_mut() {
let mut visitor = visitor::function::make_visitor_leave_mut::<i32, (), _>(|item| {
let mut visitor = make_visitor_leave_mut::<i32, (), _>(|item| {
*item += 1;
ControlFlow::Continue(())
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ use std::any::Any;
use std::ops::ControlFlow;

use ordered_float_5::OrderedFloat;
use visitor::Traversable as _;
use visitor::TraversableMut as _;
use visitor::Visitor;
use visitor::VisitorMut;
use visitor_derive::Traversable;
use visitor_derive::TraversableMut;
use traversable::Traversable as _;
use traversable::TraversableMut as _;
use traversable::Visitor;
use traversable::VisitorMut;
use traversable_derive::Traversable;
use traversable_derive::TraversableMut;

#[test]
fn test_ordered_float() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
use std::any::Any;
use std::ops::ControlFlow;

use visitor::TraversableMut;
use visitor::VisitorMut;
use traversable::TraversableMut;
use traversable::VisitorMut;

#[derive(TraversableMut)]
struct Chain {
Expand Down
Loading