user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass string instead of Symbol to DocCommentFormatter

Browse source
This commit is contained in:
Ruben Schmidmeister 2019-05-18 11:47:54 +02:00
parent 8d4cb6e783
commit 11a68d313a
No known key found for this signature in database
GPG key ID: 29387B5A7AAF863F
2 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/attr.rs
View file

@ -334,7 +334,7 @@ impl Rewrite for ast::Attribute {
};
let doc_comment_formatter =
DocCommentFormatter::new(literal, comment_style);
DocCommentFormatter::new(literal.as_str().get(), comment_style);
let doc_comment = format!("{}", doc_comment_formatter);
return rewrite_doc_comment(
&doc_comment,

28
src/attr/doc_comment.rs
View file

@ -1,24 +1,16 @@
use crate::comment::CommentStyle;
use std::fmt::{self, Display};
use syntax_pos::symbol::Symbol;
#[derive(new)]
pub(super) struct DocCommentFormatter<'a> {
literal: &'a Symbol,
literal: &'a str,
style: CommentStyle<'a>,
}
impl<'a> DocCommentFormatter<'a> {
pub(super) fn new(literal: &'a Symbol, style: CommentStyle<'a>) -> Self {
Self { literal, style }
}
}
impl Display for DocCommentFormatter<'_> {
fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
let opener = self.style.opener().trim_end();
let literal_as_str = self.literal.as_str().get();
let mut lines = literal_as_str.lines().peekable();
let mut lines = self.literal.lines().peekable();
while let Some(line) = lines.next() {
let is_last_line = lines.peek().is_none();
if is_last_line {
@ -27,7 +19,6 @@ impl Display for DocCommentFormatter<'_> {
writeln!(formatter, "{}{}", opener, line)?;
}
}
Ok(())
}
}
@ -35,7 +26,6 @@ impl Display for DocCommentFormatter<'_> {
#[cfg(test)]
mod tests {
use super::*;
use syntax_pos::{Globals, GLOBALS};
#[test]
fn literal_controls_leading_spaces() {
@ -78,13 +68,9 @@ mod tests {
expected_comment: &str,
style: CommentStyle<'_>,
) {
GLOBALS.set(&Globals::new(), || {
let literal = Symbol::gensym(literal);
assert_eq!(
expected_comment,
format!("{}", DocCommentFormatter::new(&literal, style))
);
});
assert_eq!(
expected_comment,
format!("{}", DocCommentFormatter::new(&literal, style))
);
}
}