Context-sensitive relative URL rewrite #97
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
notriddle
requested changes
May 4, 2018
src/lib.rs
Outdated
| link_rel: Option<&'a str>, | ||
| allowed_classes: HashMap<&'a str, HashSet<&'a str>>, | ||
| strip_comments: bool, | ||
| id_prefix: Option<&'a str>, | ||
| } | ||
|
|
||
| type UrlFilterCallback = for<'a> Fn(&str, &str, &'a str) -> Option<Cow<'a, str>> + Send + Sync + 'static; | ||
|
|
||
| impl<'a> fmt::Debug for Builder<'a> { |
There was a problem hiding this comment.
Better idea: write a wrapper type around Box<UrlFilterCallback> that implements Debug itself, so that the main Builder class can stick to the derived implementation.
There was a problem hiding this comment.
Unfortunately that won't work due to orphan rules (it's an alias, not a real type).
src/lib.rs
Outdated
| } | ||
| let replace_with = if let Some(new) = filter_map(&*name.local, &*attr.name.local, &*attr.value) { | ||
| if *new != *attr.value { | ||
| Some(format_tendril!("{}", new)) |
There was a problem hiding this comment.
Tendril::from_str() is faster.
src/lib.rs
Outdated
| link_rel: Option<&'a str>, | ||
| allowed_classes: HashMap<&'a str, HashSet<&'a str>>, | ||
| strip_comments: bool, | ||
| id_prefix: Option<&'a str>, | ||
| } | ||
|
|
||
| type UrlFilterCallback = for<'a> Fn(&str, &str, &'a str) -> Option<Cow<'a, str>> + Send + Sync + 'static; |
There was a problem hiding this comment.
Can we use a trait, like RelativeUrlEvaluate, so that our users can write their own structs to act as callbacks?
notriddle
approved these changes
May 4, 2018
notriddle
approved these changes
May 4, 2018
bors bot
added a commit
that referenced
this pull request
May 4, 2018
97: Context-sensitive relative URL rewrite r=notriddle a=kornelski Similar to #96, but with a critical difference that this is a preprocessing step, before relative URLs are resolved. This allows different relative URLs for images than links. I've named it `url_filter_map`, after a similar iterator filter in std. I've opted for storing callback directly rather than via trait, but this required a custom `Debug`, since `derive` couldn't skip the callback. Co-authored-by: Kornel <kornel@geekhood.net>
Build succeeded |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Similar to #96, but with a critical difference that this is a preprocessing step, before relative URLs are resolved. This allows different relative URLs for images than links.
I've named it
url_filter_map, after a similar iterator filter in std.I've opted for storing callback directly rather than via trait, but this required a custom
Debug, sincederivecouldn't skip the callback.