Support mocking multiple traits with same name #601
Conversation
mockall_derive/src/mock_trait.rs
Outdated
| @@ -176,3 +174,45 @@ impl MockTrait { | |||
| ) | |||
| } | |||
| } | |||
|
|
|||
| fn write_join_path( | |||
There was a problem hiding this comment.
It would be more idiomatic if this function allocated and returned a new String.
There was a problem hiding this comment.
I was trying to avoid string allocations but then again, I couldn't figure out a way to know the required capacity ahead of time anyway, so even the current single String::new approach keeps resizing it internally.
I've now updated the fn to return an owned string instead.
| Ok(()) | ||
| } | ||
|
|
||
| fn hash_path_arguments(path: &Path) -> Option<u64> { |
There was a problem hiding this comment.
Do you have any examples of a path that has path_args in segment that isn't the last?
There was a problem hiding this comment.
I don't have an example. This was done since I assumed processing the hash + concatenating the ident are symmetric. Whereas before both were done on the last segment, now we go over all the segments. Happy to revert this part to only process the last segment.
mockall_derive/src/mock_trait.rs
Outdated
| // Similar to how the `format_ident!` constructs an `Ident`. | ||
| // https://github.com/dtolnay/quote/blob/3256f897c9821f9b397cb81851ae9a1672a84cb7/src/runtime.rs#L478-L484 | ||
| fn ident_maybe_raw(id: &str, span: Span) -> Ident { | ||
| if let Some(id) = id.strip_prefix("r#") { |
There was a problem hiding this comment.
Ouch. Did you personally have a need to mock a trait with a raw identifier? This warrants a test.
There was a problem hiding this comment.
It caused the existing raw_identifier test to not compile
| fn join_path_segments(path: &Path, sep: &str) -> String { | ||
| let mut output = String::new(); | ||
| for segment in &path.segments { | ||
| if write!( |
There was a problem hiding this comment.
Too bad there isn't something like a Punctuated::join method to help with this part.
CHANGELOG.md
Outdated
| @@ -3,6 +3,14 @@ | |||
| All notable changes to this project will be documented in this file. | |||
| This project adheres to [Semantic Versioning](http://semver.org/). | |||
|
|
|||
| ## [ unreleased ] | |||
There was a problem hiding this comment.
| ## [ unreleased ] | |
| ## [ Unreleased ] - ReleaseDate |
An attempt to solve #600.
Not really sure about backward compatibility. Should be fine as we only change the generation of a private identifier. But it could cause issues if either a length limit is reached or a there's a name collision with a different ident.