2019-09-18 08:37:08 -05:00
|
|
|
use std::cell::{Cell, RefCell};
|
2019-09-04 09:00:26 -05:00
|
|
|
use std::rc::Rc;
|
2019-02-04 04:30:43 -06:00
|
|
|
|
2022-05-01 12:58:24 -05:00
|
|
|
use rustc_ast::{ast, token::Delimiter, visit};
|
2021-02-16 22:50:30 -06:00
|
|
|
use rustc_data_structures::sync::Lrc;
|
2021-10-20 00:11:59 -05:00
|
|
|
use rustc_span::{symbol, BytePos, Pos, Span};
|
2015-04-21 04:01:19 -05:00
|
|
|
|
2019-02-04 04:30:43 -06:00
|
|
|
use crate::attr::*;
|
2020-10-14 21:08:58 -05:00
|
|
|
use crate::comment::{contains_comment, rewrite_comment, CodeCharKind, CommentCodeSlices};
|
2019-10-04 10:22:01 -05:00
|
|
|
use crate::config::Version;
|
2022-07-12 19:31:19 -05:00
|
|
|
use crate::config::{BraceStyle, Config, MacroSelector};
|
2019-07-17 09:07:12 -05:00
|
|
|
use crate::coverage::transform_missing_snippet;
|
2019-02-04 04:30:43 -06:00
|
|
|
use crate::items::{
|
2021-10-20 00:11:59 -05:00
|
|
|
format_impl, format_trait, format_trait_alias, is_mod_decl, is_use_item, rewrite_extern_crate,
|
2021-11-07 20:37:34 -06:00
|
|
|
rewrite_type_alias, FnBraceStyle, FnSig, ItemVisitorKind, StaticParts, StructParts,
|
2018-04-29 07:22:48 -05:00
|
|
|
};
|
2020-02-08 22:21:37 -06:00
|
|
|
use crate::macros::{macro_style, rewrite_macro, rewrite_macro_def, MacroPosition};
|
2020-09-02 18:42:00 -05:00
|
|
|
use crate::modules::Module;
|
2021-12-29 20:49:39 -06:00
|
|
|
use crate::parse::session::ParseSess;
|
2022-06-22 22:14:32 -05:00
|
|
|
use crate::rewrite::{Rewrite, RewriteContext};
|
2019-02-04 04:30:43 -06:00
|
|
|
use crate::shape::{Indent, Shape};
|
2019-07-16 19:40:33 -05:00
|
|
|
use crate::skip::{is_skip_attr, SkipContext};
|
2019-02-04 04:30:43 -06:00
|
|
|
use crate::source_map::{LineRangeUtils, SpanUtils};
|
|
|
|
use crate::spanned::Spanned;
|
2019-06-16 18:53:39 -05:00
|
|
|
use crate::stmt::Stmt;
|
2019-02-04 04:30:43 -06:00
|
|
|
use crate::utils::{
|
2020-09-22 21:22:38 -05:00
|
|
|
self, contains_skip, count_newlines, depr_skip_annotation, format_unsafety, inner_attributes,
|
2020-05-20 10:39:34 -05:00
|
|
|
last_line_width, mk_sp, ptr_vec_to_ref_vec, rewrite_ident, starts_with_newline, stmt_expr,
|
2018-05-14 01:01:53 -05:00
|
|
|
};
|
2019-02-04 04:30:43 -06:00
|
|
|
use crate::{ErrorKind, FormatReport, FormattingError};
|
2018-03-07 00:37:44 -06:00
|
|
|
|
2017-12-06 07:48:48 -06:00
|
|
|
/// Creates a string slice corresponding to the specified span.
|
2020-03-26 21:25:34 -05:00
|
|
|
pub(crate) struct SnippetProvider {
|
2017-12-06 07:48:48 -06:00
|
|
|
/// A pointer to the content of the file we are formatting.
|
2021-02-16 22:50:30 -06:00
|
|
|
big_snippet: Lrc<String>,
|
2017-12-06 07:48:48 -06:00
|
|
|
/// A position of the start of `big_snippet`, used as an offset.
|
|
|
|
start_pos: usize,
|
2021-08-22 09:20:58 -05:00
|
|
|
/// An end position of the file that this snippet lives.
|
2020-02-08 22:21:37 -06:00
|
|
|
end_pos: usize,
|
2017-12-06 07:48:48 -06:00
|
|
|
}
|
|
|
|
|
2020-03-26 21:25:34 -05:00
|
|
|
impl SnippetProvider {
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn span_to_snippet(&self, span: Span) -> Option<&str> {
|
2017-12-06 07:48:48 -06:00
|
|
|
let start_index = span.lo().to_usize().checked_sub(self.start_pos)?;
|
|
|
|
let end_index = span.hi().to_usize().checked_sub(self.start_pos)?;
|
2017-12-06 22:51:30 -06:00
|
|
|
Some(&self.big_snippet[start_index..end_index])
|
2017-12-06 07:48:48 -06:00
|
|
|
}
|
|
|
|
|
2021-02-16 22:50:30 -06:00
|
|
|
pub(crate) fn new(start_pos: BytePos, end_pos: BytePos, big_snippet: Lrc<String>) -> Self {
|
2017-12-06 22:51:30 -06:00
|
|
|
let start_pos = start_pos.to_usize();
|
2020-02-08 22:21:37 -06:00
|
|
|
let end_pos = end_pos.to_usize();
|
2017-12-06 07:48:48 -06:00
|
|
|
SnippetProvider {
|
|
|
|
big_snippet,
|
|
|
|
start_pos,
|
2020-02-08 22:21:37 -06:00
|
|
|
end_pos,
|
2017-12-06 07:48:48 -06:00
|
|
|
}
|
|
|
|
}
|
2020-02-08 22:21:37 -06:00
|
|
|
|
2020-03-26 21:25:34 -05:00
|
|
|
pub(crate) fn entire_snippet(&self) -> &str {
|
|
|
|
self.big_snippet.as_str()
|
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) fn start_pos(&self) -> BytePos {
|
|
|
|
BytePos::from_usize(self.start_pos)
|
|
|
|
}
|
|
|
|
|
2020-02-08 22:21:37 -06:00
|
|
|
pub(crate) fn end_pos(&self) -> BytePos {
|
|
|
|
BytePos::from_usize(self.end_pos)
|
|
|
|
}
|
2017-12-06 07:48:48 -06:00
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) struct FmtVisitor<'a> {
|
2018-09-12 06:09:07 -05:00
|
|
|
parent_context: Option<&'a RewriteContext<'a>>,
|
2020-03-26 21:25:34 -05:00
|
|
|
pub(crate) parse_sess: &'a ParseSess,
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) buffer: String,
|
|
|
|
pub(crate) last_pos: BytePos,
|
2015-11-22 14:20:53 -06:00
|
|
|
// FIXME: use an RAII util or closure for indenting
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) block_indent: Indent,
|
|
|
|
pub(crate) config: &'a Config,
|
|
|
|
pub(crate) is_if_else_block: bool,
|
2020-03-26 21:25:34 -05:00
|
|
|
pub(crate) snippet_provider: &'a SnippetProvider,
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) line_number: usize,
|
2018-10-23 18:24:56 -05:00
|
|
|
/// List of 1-based line ranges which were annotated with skip
|
2024-01-25 17:55:23 -06:00
|
|
|
/// Both bounds are inclusive.
|
2019-09-04 09:00:26 -05:00
|
|
|
pub(crate) skipped_range: Rc<RefCell<Vec<(usize, usize)>>>,
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) macro_rewrite_failure: bool,
|
2018-05-18 23:44:48 -05:00
|
|
|
pub(crate) report: FormatReport,
|
2019-07-16 19:40:33 -05:00
|
|
|
pub(crate) skip_context: SkipContext,
|
2020-11-10 20:07:42 -06:00
|
|
|
pub(crate) is_macro_def: bool,
|
2015-04-21 04:01:19 -05:00
|
|
|
}
|
|
|
|
|
2018-09-12 06:09:07 -05:00
|
|
|
impl<'a> Drop for FmtVisitor<'a> {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
if let Some(ctx) = self.parent_context {
|
|
|
|
if self.macro_rewrite_failure {
|
|
|
|
ctx.macro_rewrite_failure.replace(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-06 22:51:30 -06:00
|
|
|
impl<'b, 'a: 'b> FmtVisitor<'a> {
|
2019-02-09 01:14:30 -06:00
|
|
|
fn set_parent_context(&mut self, context: &'a RewriteContext<'_>) {
|
2018-09-12 06:09:07 -05:00
|
|
|
self.parent_context = Some(context);
|
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn shape(&self) -> Shape {
|
2017-08-30 05:26:45 -05:00
|
|
|
Shape::indented(self.block_indent, self.config)
|
|
|
|
}
|
|
|
|
|
2019-07-15 08:41:56 -05:00
|
|
|
fn next_span(&self, hi: BytePos) -> Span {
|
|
|
|
mk_sp(self.last_pos, hi)
|
|
|
|
}
|
|
|
|
|
2021-01-09 11:23:36 -06:00
|
|
|
fn visit_stmt(&mut self, stmt: &Stmt<'_>, include_empty_semi: bool) {
|
2017-06-11 22:58:58 -05:00
|
|
|
debug!(
|
2020-03-26 21:25:34 -05:00
|
|
|
"visit_stmt: {}",
|
|
|
|
self.parse_sess.span_to_debug_info(stmt.span())
|
2017-06-11 22:58:58 -05:00
|
|
|
);
|
2016-05-25 13:41:26 -05:00
|
|
|
|
2020-05-20 10:39:34 -05:00
|
|
|
if stmt.is_empty() {
|
|
|
|
// If the statement is empty, just skip over it. Before that, make sure any comment
|
|
|
|
// snippet preceding the semicolon is picked up.
|
|
|
|
let snippet = self.snippet(mk_sp(self.last_pos, stmt.span().lo()));
|
|
|
|
let original_starts_with_newline = snippet
|
|
|
|
.find(|c| c != ' ')
|
|
|
|
.map_or(false, |i| starts_with_newline(&snippet[i..]));
|
|
|
|
let snippet = snippet.trim();
|
|
|
|
if !snippet.is_empty() {
|
2021-01-09 11:23:36 -06:00
|
|
|
// FIXME(calebcartwright 2021-01-03) - This exists strictly to maintain legacy
|
|
|
|
// formatting where rustfmt would preserve redundant semicolons on Items in a
|
|
|
|
// statement position.
|
|
|
|
// See comment within `walk_stmts` for more info
|
|
|
|
if include_empty_semi {
|
|
|
|
self.format_missing(stmt.span().hi());
|
|
|
|
} else {
|
|
|
|
if original_starts_with_newline {
|
|
|
|
self.push_str("\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
self.push_str(&self.block_indent.to_string(self.config));
|
|
|
|
self.push_str(snippet);
|
2020-05-20 10:39:34 -05:00
|
|
|
}
|
2021-01-09 11:23:36 -06:00
|
|
|
} else if include_empty_semi {
|
|
|
|
self.push_str(";");
|
2020-05-20 10:39:34 -05:00
|
|
|
}
|
2019-09-06 08:41:03 -05:00
|
|
|
self.last_pos = stmt.span().hi();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-10-05 09:40:24 -05:00
|
|
|
match stmt.as_ast_node().kind {
|
2016-09-15 22:19:18 -05:00
|
|
|
ast::StmtKind::Item(ref item) => {
|
|
|
|
self.visit_item(item);
|
2021-01-09 11:23:36 -06:00
|
|
|
self.last_pos = stmt.span().hi();
|
2015-08-21 06:31:09 -05:00
|
|
|
}
|
2017-09-05 02:50:55 -05:00
|
|
|
ast::StmtKind::Local(..) | ast::StmtKind::Expr(..) | ast::StmtKind::Semi(..) => {
|
2020-03-30 13:11:00 -05:00
|
|
|
let attrs = get_attrs_from_stmt(stmt.as_ast_node());
|
|
|
|
if contains_skip(attrs) {
|
|
|
|
self.push_skipped_with_span(
|
|
|
|
attrs,
|
|
|
|
stmt.span(),
|
|
|
|
get_span_without_attrs(stmt.as_ast_node()),
|
|
|
|
);
|
2017-12-08 02:46:43 -06:00
|
|
|
} else {
|
2018-10-15 06:36:39 -05:00
|
|
|
let shape = self.shape();
|
2021-11-07 20:37:34 -06:00
|
|
|
let rewrite = self.with_context(|ctx| stmt.rewrite(ctx, shape));
|
2017-12-08 02:46:43 -06:00
|
|
|
self.push_rewrite(stmt.span(), rewrite)
|
|
|
|
}
|
2017-06-13 10:08:31 -05:00
|
|
|
}
|
2020-09-16 08:37:14 -05:00
|
|
|
ast::StmtKind::MacCall(ref mac_stmt) => {
|
|
|
|
if self.visit_attrs(&mac_stmt.attrs, ast::AttrStyle::Outer) {
|
2019-06-16 18:53:39 -05:00
|
|
|
self.push_skipped_with_span(
|
2020-09-16 08:37:14 -05:00
|
|
|
&mac_stmt.attrs,
|
2019-06-16 18:53:39 -05:00
|
|
|
stmt.span(),
|
|
|
|
get_span_without_attrs(stmt.as_ast_node()),
|
|
|
|
);
|
2017-07-21 21:18:47 -05:00
|
|
|
} else {
|
2020-09-16 08:37:14 -05:00
|
|
|
self.visit_mac(&mac_stmt.mac, None, MacroPosition::Statement);
|
2017-07-21 21:18:47 -05:00
|
|
|
}
|
2019-06-16 18:53:39 -05:00
|
|
|
self.format_missing(stmt.span().hi());
|
2015-08-21 06:31:09 -05:00
|
|
|
}
|
2020-03-26 17:20:24 -05:00
|
|
|
ast::StmtKind::Empty => (),
|
2015-04-28 22:00:58 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-07-15 08:41:56 -05:00
|
|
|
/// Remove spaces between the opening brace and the first statement or the inner attribute
|
|
|
|
/// of the block.
|
|
|
|
fn trim_spaces_after_opening_brace(
|
2017-11-29 15:12:32 -06:00
|
|
|
&mut self,
|
|
|
|
b: &ast::Block,
|
|
|
|
inner_attrs: Option<&[ast::Attribute]>,
|
|
|
|
) {
|
2018-05-17 23:56:55 -05:00
|
|
|
if let Some(first_stmt) = b.stmts.first() {
|
2019-01-29 09:55:52 -06:00
|
|
|
let hi = inner_attrs
|
2018-05-17 23:56:55 -05:00
|
|
|
.and_then(|attrs| inner_attributes(attrs).first().map(|attr| attr.span.lo()))
|
2019-04-11 06:48:13 -05:00
|
|
|
.unwrap_or_else(|| first_stmt.span().lo());
|
2019-07-15 08:41:56 -05:00
|
|
|
let missing_span = self.next_span(hi);
|
|
|
|
let snippet = self.snippet(missing_span);
|
2018-05-17 23:56:55 -05:00
|
|
|
let len = CommentCodeSlices::new(snippet)
|
2021-07-25 22:57:19 -05:00
|
|
|
.next()
|
2018-05-17 23:56:55 -05:00
|
|
|
.and_then(|(kind, _, s)| {
|
|
|
|
if kind == CodeCharKind::Normal {
|
|
|
|
s.rfind('\n')
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
});
|
|
|
|
if let Some(len) = len {
|
|
|
|
self.last_pos = self.last_pos + BytePos::from_usize(len);
|
2017-08-11 02:15:28 -05:00
|
|
|
}
|
|
|
|
}
|
2019-07-15 08:41:56 -05:00
|
|
|
}
|
2017-08-11 02:15:28 -05:00
|
|
|
|
2019-07-15 08:41:56 -05:00
|
|
|
pub(crate) fn visit_block(
|
|
|
|
&mut self,
|
|
|
|
b: &ast::Block,
|
|
|
|
inner_attrs: Option<&[ast::Attribute]>,
|
|
|
|
has_braces: bool,
|
|
|
|
) {
|
|
|
|
debug!(
|
2020-03-26 21:25:34 -05:00
|
|
|
"visit_block: {}",
|
|
|
|
self.parse_sess.span_to_debug_info(b.span),
|
2019-07-15 08:41:56 -05:00
|
|
|
);
|
|
|
|
|
|
|
|
// Check if this block has braces.
|
|
|
|
let brace_compensation = BytePos(if has_braces { 1 } else { 0 });
|
|
|
|
|
|
|
|
self.last_pos = self.last_pos + brace_compensation;
|
|
|
|
self.block_indent = self.block_indent.block_indent(self.config);
|
|
|
|
self.push_str("{");
|
|
|
|
self.trim_spaces_after_opening_brace(b, inner_attrs);
|
|
|
|
|
|
|
|
// Format inner attributes if available.
|
|
|
|
if let Some(attrs) = inner_attrs {
|
|
|
|
self.visit_attrs(attrs, ast::AttrStyle::Inner);
|
2017-07-24 10:55:55 -05:00
|
|
|
}
|
|
|
|
|
2017-09-15 08:31:52 -05:00
|
|
|
self.walk_block_stmts(b);
|
2015-08-01 07:22:31 -05:00
|
|
|
|
2016-09-15 22:19:18 -05:00
|
|
|
if !b.stmts.is_empty() {
|
2019-03-11 09:18:43 -05:00
|
|
|
if let Some(expr) = stmt_expr(&b.stmts[b.stmts.len() - 1]) {
|
2017-07-11 08:41:38 -05:00
|
|
|
if utils::semicolon_for_expr(&self.get_context(), expr) {
|
2017-12-08 01:59:04 -06:00
|
|
|
self.push_str(";");
|
2016-09-15 22:19:18 -05:00
|
|
|
}
|
2015-04-21 04:01:19 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-07-17 09:07:12 -05:00
|
|
|
let rest_span = self.next_span(b.span.hi());
|
|
|
|
if out_of_file_lines_range!(self, rest_span) {
|
|
|
|
self.push_str(self.snippet(rest_span));
|
2017-06-01 21:58:19 -05:00
|
|
|
self.block_indent = self.block_indent.block_unindent(self.config);
|
2019-07-17 09:07:12 -05:00
|
|
|
} else {
|
|
|
|
// Ignore the closing brace.
|
|
|
|
let missing_span = self.next_span(b.span.hi() - brace_compensation);
|
|
|
|
self.close_block(missing_span, self.unindent_comment_on_closing_brace(b));
|
2017-06-01 21:58:19 -05:00
|
|
|
}
|
2017-08-19 13:47:40 -05:00
|
|
|
self.last_pos = source!(self, b.span).hi();
|
2015-11-20 15:44:15 -06:00
|
|
|
}
|
|
|
|
|
2019-07-17 09:07:12 -05:00
|
|
|
fn close_block(&mut self, span: Span, unindent_comment: bool) {
|
|
|
|
let config = self.config;
|
2019-06-23 00:32:14 -05:00
|
|
|
|
2019-07-17 09:07:12 -05:00
|
|
|
let mut last_hi = span.lo();
|
|
|
|
let mut unindented = false;
|
|
|
|
let mut prev_ends_with_newline = false;
|
|
|
|
let mut extra_newline = false;
|
|
|
|
|
|
|
|
let skip_normal = |s: &str| {
|
|
|
|
let trimmed = s.trim();
|
|
|
|
trimmed.is_empty() || trimmed.chars().all(|c| c == ';')
|
|
|
|
};
|
|
|
|
|
2020-10-14 21:08:58 -05:00
|
|
|
let comment_snippet = self.snippet(span);
|
|
|
|
|
2021-11-07 20:37:34 -06:00
|
|
|
let align_to_right = if unindent_comment && contains_comment(comment_snippet) {
|
2020-10-14 21:08:58 -05:00
|
|
|
let first_lines = comment_snippet.splitn(2, '/').next().unwrap_or("");
|
2021-11-07 20:37:34 -06:00
|
|
|
last_line_width(first_lines) > last_line_width(comment_snippet)
|
2020-10-14 21:08:58 -05:00
|
|
|
} else {
|
|
|
|
false
|
|
|
|
};
|
|
|
|
|
|
|
|
for (kind, offset, sub_slice) in CommentCodeSlices::new(comment_snippet) {
|
2019-07-17 09:07:12 -05:00
|
|
|
let sub_slice = transform_missing_snippet(config, sub_slice);
|
|
|
|
|
|
|
|
debug!("close_block: {:?} {:?} {:?}", kind, offset, sub_slice);
|
|
|
|
|
|
|
|
match kind {
|
|
|
|
CodeCharKind::Comment => {
|
2020-10-14 21:08:58 -05:00
|
|
|
if !unindented && unindent_comment && !align_to_right {
|
2019-07-17 09:07:12 -05:00
|
|
|
unindented = true;
|
|
|
|
self.block_indent = self.block_indent.block_unindent(config);
|
|
|
|
}
|
|
|
|
let span_in_between = mk_sp(last_hi, span.lo() + BytePos::from_usize(offset));
|
|
|
|
let snippet_in_between = self.snippet(span_in_between);
|
2021-07-25 22:57:19 -05:00
|
|
|
let mut comment_on_same_line = !snippet_in_between.contains('\n');
|
2019-07-17 09:07:12 -05:00
|
|
|
|
|
|
|
let mut comment_shape =
|
|
|
|
Shape::indented(self.block_indent, config).comment(config);
|
2019-10-04 10:22:01 -05:00
|
|
|
if self.config.version() == Version::Two && comment_on_same_line {
|
2019-07-17 09:07:12 -05:00
|
|
|
self.push_str(" ");
|
2019-10-04 10:22:01 -05:00
|
|
|
// put the first line of the comment on the same line as the
|
|
|
|
// block's last line
|
2021-07-25 22:57:19 -05:00
|
|
|
match sub_slice.find('\n') {
|
2019-10-04 10:22:01 -05:00
|
|
|
None => {
|
|
|
|
self.push_str(&sub_slice);
|
|
|
|
}
|
|
|
|
Some(offset) if offset + 1 == sub_slice.len() => {
|
|
|
|
self.push_str(&sub_slice[..offset]);
|
|
|
|
}
|
|
|
|
Some(offset) => {
|
|
|
|
let first_line = &sub_slice[..offset];
|
|
|
|
self.push_str(first_line);
|
|
|
|
self.push_str(&self.block_indent.to_string_with_newline(config));
|
|
|
|
|
|
|
|
// put the other lines below it, shaping it as needed
|
|
|
|
let other_lines = &sub_slice[offset + 1..];
|
|
|
|
let comment_str =
|
|
|
|
rewrite_comment(other_lines, false, comment_shape, config);
|
|
|
|
match comment_str {
|
|
|
|
Some(ref s) => self.push_str(s),
|
|
|
|
None => self.push_str(other_lines),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-07-17 09:07:12 -05:00
|
|
|
} else {
|
2019-10-04 10:22:01 -05:00
|
|
|
if comment_on_same_line {
|
|
|
|
// 1 = a space before `//`
|
|
|
|
let offset_len = 1 + last_line_width(&self.buffer)
|
|
|
|
.saturating_sub(self.block_indent.width());
|
|
|
|
match comment_shape
|
|
|
|
.visual_indent(offset_len)
|
|
|
|
.sub_width(offset_len)
|
|
|
|
{
|
|
|
|
Some(shp) => comment_shape = shp,
|
|
|
|
None => comment_on_same_line = false,
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
if comment_on_same_line {
|
|
|
|
self.push_str(" ");
|
|
|
|
} else {
|
|
|
|
if count_newlines(snippet_in_between) >= 2 || extra_newline {
|
|
|
|
self.push_str("\n");
|
|
|
|
}
|
|
|
|
self.push_str(&self.block_indent.to_string_with_newline(config));
|
2019-07-17 09:07:12 -05:00
|
|
|
}
|
|
|
|
|
2019-10-04 10:22:01 -05:00
|
|
|
let comment_str = rewrite_comment(&sub_slice, false, comment_shape, config);
|
|
|
|
match comment_str {
|
|
|
|
Some(ref s) => self.push_str(s),
|
|
|
|
None => self.push_str(&sub_slice),
|
|
|
|
}
|
2019-07-17 09:07:12 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
CodeCharKind::Normal if skip_normal(&sub_slice) => {
|
|
|
|
extra_newline = prev_ends_with_newline && sub_slice.contains('\n');
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
CodeCharKind::Normal => {
|
|
|
|
self.push_str(&self.block_indent.to_string_with_newline(config));
|
|
|
|
self.push_str(sub_slice.trim());
|
2019-06-23 00:32:14 -05:00
|
|
|
}
|
|
|
|
}
|
2019-07-17 09:07:12 -05:00
|
|
|
prev_ends_with_newline = sub_slice.ends_with('\n');
|
|
|
|
extra_newline = false;
|
|
|
|
last_hi = span.lo() + BytePos::from_usize(offset + sub_slice.len());
|
|
|
|
}
|
|
|
|
if unindented {
|
|
|
|
self.block_indent = self.block_indent.block_indent(self.config);
|
2019-03-19 04:19:45 -05:00
|
|
|
}
|
2015-10-19 14:41:47 -05:00
|
|
|
self.block_indent = self.block_indent.block_unindent(self.config);
|
2019-07-17 09:07:12 -05:00
|
|
|
self.push_str(&self.block_indent.to_string_with_newline(config));
|
|
|
|
self.push_str("}");
|
|
|
|
}
|
|
|
|
|
|
|
|
fn unindent_comment_on_closing_brace(&self, b: &ast::Block) -> bool {
|
|
|
|
self.is_if_else_block && !b.stmts.is_empty()
|
2015-04-21 04:01:19 -05:00
|
|
|
}
|
|
|
|
|
2015-05-11 08:05:12 -05:00
|
|
|
// Note that this only gets called for function definitions. Required methods
|
2015-04-21 04:01:19 -05:00
|
|
|
// on traits do not get handled here.
|
2020-07-09 21:56:46 -05:00
|
|
|
pub(crate) fn visit_fn(
|
2017-06-11 22:58:58 -05:00
|
|
|
&mut self,
|
2019-02-09 01:14:30 -06:00
|
|
|
fk: visit::FnKind<'_>,
|
2017-06-11 22:58:58 -05:00
|
|
|
fd: &ast::FnDecl,
|
|
|
|
s: Span,
|
|
|
|
defaultness: ast::Defaultness,
|
2017-07-24 10:55:55 -05:00
|
|
|
inner_attrs: Option<&[ast::Attribute]>,
|
2017-06-11 22:58:58 -05:00
|
|
|
) {
|
2015-04-28 03:56:01 -05:00
|
|
|
let indent = self.block_indent;
|
2016-11-20 13:37:35 -06:00
|
|
|
let block;
|
2015-09-04 11:09:05 -05:00
|
|
|
let rewrite = match fk {
|
2021-11-19 15:03:43 -06:00
|
|
|
visit::FnKind::Fn(_, ident, _, _, _, Some(ref b)) => {
|
2016-11-20 13:37:35 -06:00
|
|
|
block = b;
|
2019-07-20 23:26:41 -05:00
|
|
|
self.rewrite_fn_before_block(
|
2017-06-11 22:58:58 -05:00
|
|
|
indent,
|
|
|
|
ident,
|
2021-11-19 15:03:43 -06:00
|
|
|
&FnSig::from_fn_kind(&fk, fd, defaultness),
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(s.lo(), b.span.lo()),
|
2017-06-11 22:58:58 -05:00
|
|
|
)
|
2015-04-21 04:01:19 -05:00
|
|
|
}
|
2020-02-08 22:21:37 -06:00
|
|
|
_ => unreachable!(),
|
2015-09-04 11:09:05 -05:00
|
|
|
};
|
|
|
|
|
2019-07-20 23:26:41 -05:00
|
|
|
if let Some((fn_str, fn_brace_style)) = rewrite {
|
2017-08-19 13:47:40 -05:00
|
|
|
self.format_missing_with_indent(source!(self, s).lo());
|
2019-07-20 23:26:41 -05:00
|
|
|
|
|
|
|
if let Some(rw) = self.single_line_fn(&fn_str, block, inner_attrs) {
|
|
|
|
self.push_str(&rw);
|
|
|
|
self.last_pos = s.hi();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-12-08 01:59:04 -06:00
|
|
|
self.push_str(&fn_str);
|
2019-07-20 23:26:41 -05:00
|
|
|
match fn_brace_style {
|
|
|
|
FnBraceStyle::SameLine => self.push_str(" "),
|
|
|
|
FnBraceStyle::NextLine => {
|
|
|
|
self.push_str(&self.block_indent.to_string_with_newline(self.config))
|
2015-11-19 20:49:24 -06:00
|
|
|
}
|
2019-07-20 23:26:41 -05:00
|
|
|
_ => unreachable!(),
|
2015-11-19 20:11:32 -06:00
|
|
|
}
|
2019-07-20 23:26:41 -05:00
|
|
|
self.last_pos = source!(self, block.span).lo();
|
2015-09-04 11:09:05 -05:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
self.format_missing(source!(self, block.span).lo());
|
2015-04-21 04:01:19 -05:00
|
|
|
}
|
|
|
|
|
2017-11-29 15:40:29 -06:00
|
|
|
self.visit_block(block, inner_attrs, true)
|
2015-04-21 04:01:19 -05:00
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn visit_item(&mut self, item: &ast::Item) {
|
2017-07-28 22:51:45 -05:00
|
|
|
skip_out_of_file_lines_range_visitor!(self, item.span);
|
|
|
|
|
2016-05-18 15:36:59 -05:00
|
|
|
// This is where we bail out if there is a skip attribute. This is only
|
|
|
|
// complex in the module case. It is complex because the module could be
|
2016-11-02 23:22:16 -05:00
|
|
|
// in a separate file and there might be attributes in both files, but
|
2016-05-18 15:36:59 -05:00
|
|
|
// the AST lumps them all together.
|
2017-11-01 01:33:55 -05:00
|
|
|
let filtered_attrs;
|
2017-09-06 05:24:14 -05:00
|
|
|
let mut attrs = &item.attrs;
|
2019-07-16 19:40:33 -05:00
|
|
|
let skip_context_saved = self.skip_context.clone();
|
2021-11-07 20:37:34 -06:00
|
|
|
self.skip_context.update_with_attrs(attrs);
|
2019-03-18 07:41:31 -05:00
|
|
|
|
2019-10-05 09:40:24 -05:00
|
|
|
let should_visit_node_again = match item.kind {
|
2019-06-04 10:14:12 -05:00
|
|
|
// For use/extern crate items, skip rewriting attributes but check for a skip attribute.
|
|
|
|
ast::ItemKind::Use(..) | ast::ItemKind::ExternCrate(_) => {
|
2018-05-06 03:01:14 -05:00
|
|
|
if contains_skip(attrs) {
|
2019-02-06 00:34:50 -06:00
|
|
|
self.push_skipped_with_span(attrs.as_slice(), item.span(), item.span());
|
2019-03-18 07:41:31 -05:00
|
|
|
false
|
|
|
|
} else {
|
|
|
|
true
|
2018-05-06 03:01:14 -05:00
|
|
|
}
|
|
|
|
}
|
2018-01-29 06:59:15 -06:00
|
|
|
// Module is inline, in this case we treat it like any other item.
|
|
|
|
_ if !is_mod_decl(item) => {
|
|
|
|
if self.visit_attrs(&item.attrs, ast::AttrStyle::Outer) {
|
2019-02-06 00:34:50 -06:00
|
|
|
self.push_skipped_with_span(item.attrs.as_slice(), item.span(), item.span());
|
2019-03-18 07:41:31 -05:00
|
|
|
false
|
|
|
|
} else {
|
|
|
|
true
|
2015-11-22 14:20:53 -06:00
|
|
|
}
|
|
|
|
}
|
2018-01-29 06:59:15 -06:00
|
|
|
// Module is not inline, but should be skipped.
|
2019-03-18 07:41:31 -05:00
|
|
|
ast::ItemKind::Mod(..) if contains_skip(&item.attrs) => false,
|
2018-01-29 06:59:15 -06:00
|
|
|
// Module is not inline and should not be skipped. We want
|
|
|
|
// to process only the attributes in the current file.
|
|
|
|
ast::ItemKind::Mod(..) => {
|
|
|
|
filtered_attrs = filter_inline_attrs(&item.attrs, item.span());
|
|
|
|
// Assert because if we should skip it should be caught by
|
|
|
|
// the above case.
|
|
|
|
assert!(!self.visit_attrs(&filtered_attrs, ast::AttrStyle::Outer));
|
|
|
|
attrs = &filtered_attrs;
|
2019-03-18 07:41:31 -05:00
|
|
|
true
|
2018-01-29 06:59:15 -06:00
|
|
|
}
|
2017-08-15 10:48:12 -05:00
|
|
|
_ => {
|
|
|
|
if self.visit_attrs(&item.attrs, ast::AttrStyle::Outer) {
|
2019-02-06 00:34:50 -06:00
|
|
|
self.push_skipped_with_span(item.attrs.as_slice(), item.span(), item.span());
|
2019-03-18 07:41:31 -05:00
|
|
|
false
|
|
|
|
} else {
|
|
|
|
true
|
2017-08-15 10:48:12 -05:00
|
|
|
}
|
|
|
|
}
|
2019-03-16 09:13:10 -05:00
|
|
|
};
|
2019-03-18 07:41:31 -05:00
|
|
|
|
2021-02-06 15:13:14 -06:00
|
|
|
// TODO(calebcartwright): consider enabling box_patterns feature gate
|
2019-03-18 07:41:31 -05:00
|
|
|
if should_visit_node_again {
|
2019-10-05 09:40:24 -05:00
|
|
|
match item.kind {
|
2019-03-18 07:41:31 -05:00
|
|
|
ast::ItemKind::Use(ref tree) => self.format_import(item, tree),
|
2021-12-02 21:35:30 -06:00
|
|
|
ast::ItemKind::Impl(ref iimpl) => {
|
2019-03-18 07:41:31 -05:00
|
|
|
let block_indent = self.block_indent;
|
2021-12-02 21:35:30 -06:00
|
|
|
let rw = self.with_context(|ctx| format_impl(ctx, item, iimpl, block_indent));
|
2019-03-18 07:41:31 -05:00
|
|
|
self.push_rewrite(item.span, rw);
|
|
|
|
}
|
|
|
|
ast::ItemKind::Trait(..) => {
|
|
|
|
let block_indent = self.block_indent;
|
2021-11-07 20:37:34 -06:00
|
|
|
let rw = self.with_context(|ctx| format_trait(ctx, item, block_indent));
|
2019-03-18 07:41:31 -05:00
|
|
|
self.push_rewrite(item.span, rw);
|
|
|
|
}
|
|
|
|
ast::ItemKind::TraitAlias(ref generics, ref generic_bounds) => {
|
|
|
|
let shape = Shape::indented(self.block_indent, self.config);
|
|
|
|
let rw = format_trait_alias(
|
|
|
|
&self.get_context(),
|
|
|
|
item.ident,
|
|
|
|
&item.vis,
|
|
|
|
generics,
|
|
|
|
generic_bounds,
|
|
|
|
shape,
|
|
|
|
);
|
|
|
|
self.push_rewrite(item.span, rw);
|
|
|
|
}
|
|
|
|
ast::ItemKind::ExternCrate(_) => {
|
2019-06-04 10:14:12 -05:00
|
|
|
let rw = rewrite_extern_crate(&self.get_context(), item, self.shape());
|
|
|
|
let span = if attrs.is_empty() {
|
|
|
|
item.span
|
|
|
|
} else {
|
|
|
|
mk_sp(attrs[0].span.lo(), item.span.hi())
|
|
|
|
};
|
|
|
|
self.push_rewrite(span, rw);
|
2019-03-18 07:41:31 -05:00
|
|
|
}
|
|
|
|
ast::ItemKind::Struct(..) | ast::ItemKind::Union(..) => {
|
|
|
|
self.visit_struct(&StructParts::from_item(item));
|
|
|
|
}
|
|
|
|
ast::ItemKind::Enum(ref def, ref generics) => {
|
|
|
|
self.format_missing_with_indent(source!(self, item.span).lo());
|
|
|
|
self.visit_enum(item.ident, &item.vis, def, generics, item.span);
|
|
|
|
self.last_pos = source!(self, item.span).hi();
|
|
|
|
}
|
2021-03-28 16:25:30 -05:00
|
|
|
ast::ItemKind::Mod(unsafety, ref mod_kind) => {
|
2019-03-18 07:41:31 -05:00
|
|
|
self.format_missing_with_indent(source!(self, item.span).lo());
|
2021-03-28 16:25:30 -05:00
|
|
|
self.format_mod(mod_kind, unsafety, &item.vis, item.span, item.ident, attrs);
|
2019-03-18 07:41:31 -05:00
|
|
|
}
|
2020-03-26 23:18:16 -05:00
|
|
|
ast::ItemKind::MacCall(ref mac) => {
|
2019-03-18 07:41:31 -05:00
|
|
|
self.visit_mac(mac, Some(item.ident), MacroPosition::Item);
|
|
|
|
}
|
|
|
|
ast::ItemKind::ForeignMod(ref foreign_mod) => {
|
|
|
|
self.format_missing_with_indent(source!(self, item.span).lo());
|
|
|
|
self.format_foreign_mod(foreign_mod, item.span);
|
|
|
|
}
|
|
|
|
ast::ItemKind::Static(..) | ast::ItemKind::Const(..) => {
|
|
|
|
self.visit_static(&StaticParts::from_item(item));
|
|
|
|
}
|
2021-02-06 15:13:14 -06:00
|
|
|
ast::ItemKind::Fn(ref fn_kind) => {
|
2021-11-07 02:43:49 -06:00
|
|
|
let ast::Fn {
|
|
|
|
defaultness,
|
|
|
|
ref sig,
|
|
|
|
ref generics,
|
|
|
|
ref body,
|
|
|
|
} = **fn_kind;
|
|
|
|
if let Some(ref body) = body {
|
2021-02-06 15:13:14 -06:00
|
|
|
let inner_attrs = inner_attributes(&item.attrs);
|
2021-11-07 02:43:49 -06:00
|
|
|
let fn_ctxt = match sig.header.ext {
|
2021-02-06 15:13:14 -06:00
|
|
|
ast::Extern::None => visit::FnCtxt::Free,
|
|
|
|
_ => visit::FnCtxt::Foreign,
|
|
|
|
};
|
|
|
|
self.visit_fn(
|
2021-11-19 15:03:43 -06:00
|
|
|
visit::FnKind::Fn(
|
|
|
|
fn_ctxt,
|
|
|
|
item.ident,
|
|
|
|
sig,
|
|
|
|
&item.vis,
|
|
|
|
generics,
|
|
|
|
Some(body),
|
|
|
|
),
|
2021-11-07 02:43:49 -06:00
|
|
|
&sig.decl,
|
2020-10-08 19:27:04 -05:00
|
|
|
item.span,
|
2021-02-06 15:13:14 -06:00
|
|
|
defaultness,
|
|
|
|
Some(&inner_attrs),
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
let indent = self.block_indent;
|
|
|
|
let rewrite = self.rewrite_required_fn(
|
2021-12-29 20:49:39 -06:00
|
|
|
indent, item.ident, sig, &item.vis, generics, item.span,
|
2020-02-08 22:21:37 -06:00
|
|
|
);
|
|
|
|
self.push_rewrite(item.span, rewrite);
|
|
|
|
}
|
2021-02-06 15:13:14 -06:00
|
|
|
}
|
2021-11-07 20:37:34 -06:00
|
|
|
ast::ItemKind::TyAlias(ref ty_alias) => {
|
|
|
|
use ItemVisitorKind::Item;
|
2021-12-29 20:49:39 -06:00
|
|
|
self.visit_ty_alias_kind(ty_alias, &Item(item), item.span);
|
2021-02-06 15:13:14 -06:00
|
|
|
}
|
2019-03-18 07:41:31 -05:00
|
|
|
ast::ItemKind::GlobalAsm(..) => {
|
|
|
|
let snippet = Some(self.snippet(item.span).to_owned());
|
|
|
|
self.push_rewrite(item.span, snippet);
|
|
|
|
}
|
|
|
|
ast::ItemKind::MacroDef(ref def) => {
|
|
|
|
let rewrite = rewrite_macro_def(
|
|
|
|
&self.get_context(),
|
|
|
|
self.shape(),
|
|
|
|
self.block_indent,
|
|
|
|
def,
|
|
|
|
item.ident,
|
|
|
|
&item.vis,
|
|
|
|
item.span,
|
|
|
|
);
|
|
|
|
self.push_rewrite(item.span, rewrite);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
2019-07-16 19:40:33 -05:00
|
|
|
self.skip_context = skip_context_saved;
|
2015-04-21 04:01:19 -05:00
|
|
|
}
|
|
|
|
|
2021-11-07 20:37:34 -06:00
|
|
|
fn visit_ty_alias_kind(
|
|
|
|
&mut self,
|
|
|
|
ty_kind: &ast::TyAlias,
|
|
|
|
visitor_kind: &ItemVisitorKind<'_>,
|
|
|
|
span: Span,
|
|
|
|
) {
|
|
|
|
let rewrite = rewrite_type_alias(
|
|
|
|
ty_kind,
|
|
|
|
&self.get_context(),
|
|
|
|
self.block_indent,
|
|
|
|
visitor_kind,
|
|
|
|
span,
|
|
|
|
);
|
|
|
|
self.push_rewrite(span, rewrite);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn visit_assoc_item(&mut self, visitor_kind: &ItemVisitorKind<'_>) {
|
|
|
|
use ItemVisitorKind::*;
|
|
|
|
// TODO(calebcartwright): Not sure the skip spans are correct
|
|
|
|
let (ai, skip_span, assoc_ctxt) = match visitor_kind {
|
|
|
|
AssocTraitItem(ai) => (*ai, ai.span(), visit::AssocCtxt::Trait),
|
|
|
|
AssocImplItem(ai) => (*ai, ai.span, visit::AssocCtxt::Impl),
|
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
|
|
|
skip_out_of_file_lines_range_visitor!(self, ai.span);
|
2017-07-28 22:51:45 -05:00
|
|
|
|
2021-11-07 20:37:34 -06:00
|
|
|
if self.visit_attrs(&ai.attrs, ast::AttrStyle::Outer) {
|
2021-12-29 20:49:39 -06:00
|
|
|
self.push_skipped_with_span(ai.attrs.as_slice(), skip_span, skip_span);
|
2015-04-22 23:22:48 -05:00
|
|
|
return;
|
|
|
|
}
|
2015-05-03 17:12:39 -05:00
|
|
|
|
2021-02-06 15:13:14 -06:00
|
|
|
// TODO(calebcartwright): consider enabling box_patterns feature gate
|
2021-11-07 20:37:34 -06:00
|
|
|
match (&ai.kind, visitor_kind) {
|
|
|
|
(ast::AssocItemKind::Const(..), AssocTraitItem(_)) => {
|
2021-12-29 20:49:39 -06:00
|
|
|
self.visit_static(&StaticParts::from_trait_item(ai))
|
2021-11-07 20:37:34 -06:00
|
|
|
}
|
|
|
|
(ast::AssocItemKind::Const(..), AssocImplItem(_)) => {
|
2021-12-29 20:49:39 -06:00
|
|
|
self.visit_static(&StaticParts::from_impl_item(ai))
|
2021-11-07 20:37:34 -06:00
|
|
|
}
|
|
|
|
(ast::AssocItemKind::Fn(ref fn_kind), _) => {
|
2021-11-07 02:43:49 -06:00
|
|
|
let ast::Fn {
|
|
|
|
defaultness,
|
|
|
|
ref sig,
|
|
|
|
ref generics,
|
|
|
|
ref body,
|
|
|
|
} = **fn_kind;
|
|
|
|
if let Some(ref body) = body {
|
2021-11-07 20:37:34 -06:00
|
|
|
let inner_attrs = inner_attributes(&ai.attrs);
|
|
|
|
let fn_ctxt = visit::FnCtxt::Assoc(assoc_ctxt);
|
2021-02-06 15:13:14 -06:00
|
|
|
self.visit_fn(
|
2021-11-19 15:03:43 -06:00
|
|
|
visit::FnKind::Fn(fn_ctxt, ai.ident, sig, &ai.vis, generics, Some(body)),
|
2021-02-06 15:13:14 -06:00
|
|
|
&sig.decl,
|
2021-11-07 20:37:34 -06:00
|
|
|
ai.span,
|
2021-02-06 15:13:14 -06:00
|
|
|
defaultness,
|
|
|
|
Some(&inner_attrs),
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
let indent = self.block_indent;
|
|
|
|
let rewrite =
|
2021-11-07 20:37:34 -06:00
|
|
|
self.rewrite_required_fn(indent, ai.ident, sig, &ai.vis, generics, ai.span);
|
|
|
|
self.push_rewrite(ai.span, rewrite);
|
2021-02-06 15:13:14 -06:00
|
|
|
}
|
2015-10-21 15:21:14 -05:00
|
|
|
}
|
2022-10-09 21:05:24 -05:00
|
|
|
(ast::AssocItemKind::Type(ref ty_alias), _) => {
|
2021-11-07 20:37:34 -06:00
|
|
|
self.visit_ty_alias_kind(ty_alias, visitor_kind, ai.span);
|
2015-10-21 15:21:14 -05:00
|
|
|
}
|
2021-11-07 20:37:34 -06:00
|
|
|
(ast::AssocItemKind::MacCall(ref mac), _) => {
|
|
|
|
self.visit_mac(mac, Some(ai.ident), MacroPosition::Item);
|
2016-09-15 22:19:18 -05:00
|
|
|
}
|
2021-11-07 20:37:34 -06:00
|
|
|
_ => unreachable!(),
|
2015-05-03 17:12:39 -05:00
|
|
|
}
|
2015-04-22 23:22:48 -05:00
|
|
|
}
|
|
|
|
|
2021-11-07 20:37:34 -06:00
|
|
|
pub(crate) fn visit_trait_item(&mut self, ti: &ast::AssocItem) {
|
|
|
|
self.visit_assoc_item(&ItemVisitorKind::AssocTraitItem(ti));
|
|
|
|
}
|
2015-10-21 15:21:14 -05:00
|
|
|
|
2021-11-07 20:37:34 -06:00
|
|
|
pub(crate) fn visit_impl_item(&mut self, ii: &ast::AssocItem) {
|
|
|
|
self.visit_assoc_item(&ItemVisitorKind::AssocImplItem(ii));
|
2015-04-22 23:22:48 -05:00
|
|
|
}
|
|
|
|
|
2020-05-19 03:31:28 -05:00
|
|
|
fn visit_mac(&mut self, mac: &ast::MacCall, ident: Option<symbol::Ident>, pos: MacroPosition) {
|
2020-02-08 22:21:37 -06:00
|
|
|
skip_out_of_file_lines_range_visitor!(self, mac.span());
|
2017-07-28 22:51:45 -05:00
|
|
|
|
2015-09-14 15:53:30 -05:00
|
|
|
// 1 = ;
|
2019-03-18 20:50:44 -05:00
|
|
|
let shape = self.shape().saturating_sub_width(1);
|
2018-06-06 22:32:58 -05:00
|
|
|
let rewrite = self.with_context(|ctx| rewrite_macro(mac, ident, ctx, shape, pos));
|
2020-02-08 22:21:37 -06:00
|
|
|
// As of v638 of the rustc-ap-* crates, the associated span no longer includes
|
|
|
|
// the trailing semicolon. This determines the correct span to ensure scenarios
|
|
|
|
// with whitespace between the delimiters and trailing semi (i.e. `foo!(abc) ;`)
|
|
|
|
// are formatted correctly.
|
|
|
|
let (span, rewrite) = match macro_style(mac, &self.get_context()) {
|
2022-04-26 07:40:14 -05:00
|
|
|
Delimiter::Bracket | Delimiter::Parenthesis if MacroPosition::Item == pos => {
|
2020-02-08 22:21:37 -06:00
|
|
|
let search_span = mk_sp(mac.span().hi(), self.snippet_provider.end_pos());
|
|
|
|
let hi = self.snippet_provider.span_before(search_span, ";");
|
|
|
|
let target_span = mk_sp(mac.span().lo(), hi + BytePos(1));
|
|
|
|
let rewrite = rewrite.map(|rw| {
|
2021-07-25 22:57:19 -05:00
|
|
|
if !rw.ends_with(';') {
|
2020-02-08 22:21:37 -06:00
|
|
|
format!("{};", rw)
|
|
|
|
} else {
|
|
|
|
rw
|
|
|
|
}
|
|
|
|
});
|
|
|
|
(target_span, rewrite)
|
|
|
|
}
|
|
|
|
_ => (mac.span(), rewrite),
|
|
|
|
};
|
|
|
|
|
|
|
|
self.push_rewrite(span, rewrite);
|
2015-04-21 04:01:19 -05:00
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn push_str(&mut self, s: &str) {
|
2017-12-08 01:59:04 -06:00
|
|
|
self.line_number += count_newlines(s);
|
|
|
|
self.buffer.push_str(s);
|
|
|
|
}
|
|
|
|
|
2018-10-18 18:11:28 -05:00
|
|
|
#[allow(clippy::needless_pass_by_value)]
|
2018-10-23 18:24:56 -05:00
|
|
|
fn push_rewrite_inner(&mut self, span: Span, rewrite: Option<String>) {
|
2017-12-06 07:52:43 -06:00
|
|
|
if let Some(ref s) = rewrite {
|
2017-12-08 01:59:04 -06:00
|
|
|
self.push_str(s);
|
2017-12-06 07:52:43 -06:00
|
|
|
} else {
|
|
|
|
let snippet = self.snippet(span);
|
2019-09-05 05:38:00 -05:00
|
|
|
self.push_str(snippet.trim());
|
2017-12-06 07:52:43 -06:00
|
|
|
}
|
2017-08-19 13:47:40 -05:00
|
|
|
self.last_pos = source!(self, span).hi();
|
2015-10-18 15:59:39 -05:00
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn push_rewrite(&mut self, span: Span, rewrite: Option<String>) {
|
2017-12-08 02:46:43 -06:00
|
|
|
self.format_missing_with_indent(source!(self, span).lo());
|
2018-10-23 18:24:56 -05:00
|
|
|
self.push_rewrite_inner(span, rewrite);
|
2017-12-08 02:46:43 -06:00
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn push_skipped_with_span(
|
2019-02-06 00:34:50 -06:00
|
|
|
&mut self,
|
|
|
|
attrs: &[ast::Attribute],
|
|
|
|
item_span: Span,
|
|
|
|
main_span: Span,
|
|
|
|
) {
|
2018-10-23 18:24:56 -05:00
|
|
|
self.format_missing_with_indent(source!(self, item_span).lo());
|
|
|
|
// do not take into account the lines with attributes as part of the skipped range
|
|
|
|
let attrs_end = attrs
|
|
|
|
.iter()
|
2020-03-26 21:25:34 -05:00
|
|
|
.map(|attr| self.parse_sess.line_of_byte_pos(attr.span.hi()))
|
2018-10-23 18:24:56 -05:00
|
|
|
.max()
|
|
|
|
.unwrap_or(1);
|
2020-03-26 21:25:34 -05:00
|
|
|
let first_line = self.parse_sess.line_of_byte_pos(main_span.lo());
|
2019-02-06 00:34:50 -06:00
|
|
|
// Statement can start after some newlines and/or spaces
|
|
|
|
// or it can be on the same line as the last attribute.
|
2019-02-07 01:55:52 -06:00
|
|
|
// So here we need to take a minimum between the two.
|
2019-02-06 00:34:50 -06:00
|
|
|
let lo = std::cmp::min(attrs_end + 1, first_line);
|
2018-10-23 18:24:56 -05:00
|
|
|
self.push_rewrite_inner(item_span, None);
|
2017-12-08 02:46:43 -06:00
|
|
|
let hi = self.line_number + 1;
|
2019-09-04 09:00:26 -05:00
|
|
|
self.skipped_range.borrow_mut().push((lo, hi));
|
2017-12-08 02:46:43 -06:00
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn from_context(ctx: &'a RewriteContext<'_>) -> FmtVisitor<'a> {
|
2020-03-26 21:25:34 -05:00
|
|
|
let mut visitor = FmtVisitor::from_parse_sess(
|
|
|
|
ctx.parse_sess,
|
2018-05-14 01:01:53 -05:00
|
|
|
ctx.config,
|
|
|
|
ctx.snippet_provider,
|
|
|
|
ctx.report.clone(),
|
2018-09-12 06:09:07 -05:00
|
|
|
);
|
2019-07-16 19:40:33 -05:00
|
|
|
visitor.skip_context.update(ctx.skip_context.clone());
|
2018-09-12 06:09:07 -05:00
|
|
|
visitor.set_parent_context(ctx);
|
|
|
|
visitor
|
2017-12-06 22:53:10 -06:00
|
|
|
}
|
|
|
|
|
2020-03-26 21:25:34 -05:00
|
|
|
pub(crate) fn from_parse_sess(
|
2017-12-06 07:51:52 -06:00
|
|
|
parse_session: &'a ParseSess,
|
|
|
|
config: &'a Config,
|
2020-03-26 21:25:34 -05:00
|
|
|
snippet_provider: &'a SnippetProvider,
|
2018-05-14 01:01:53 -05:00
|
|
|
report: FormatReport,
|
2017-12-06 07:51:52 -06:00
|
|
|
) -> FmtVisitor<'a> {
|
2022-07-12 19:31:19 -05:00
|
|
|
let mut skip_context = SkipContext::default();
|
|
|
|
let mut macro_names = Vec::new();
|
|
|
|
for macro_selector in config.skip_macro_invocations().0 {
|
|
|
|
match macro_selector {
|
|
|
|
MacroSelector::Name(name) => macro_names.push(name.to_string()),
|
2022-07-20 16:24:50 -05:00
|
|
|
MacroSelector::All => skip_context.macros.skip_all(),
|
2022-07-12 19:31:19 -05:00
|
|
|
}
|
|
|
|
}
|
2022-07-20 16:24:50 -05:00
|
|
|
skip_context.macros.extend(macro_names);
|
2015-07-15 20:31:20 -05:00
|
|
|
FmtVisitor {
|
2018-09-12 06:09:07 -05:00
|
|
|
parent_context: None,
|
2020-03-26 21:25:34 -05:00
|
|
|
parse_sess: parse_session,
|
2017-12-10 02:40:51 -06:00
|
|
|
buffer: String::with_capacity(snippet_provider.big_snippet.len() * 2),
|
2015-07-15 20:31:20 -05:00
|
|
|
last_pos: BytePos(0),
|
2017-05-07 17:24:32 -05:00
|
|
|
block_indent: Indent::empty(),
|
2018-01-21 22:05:18 -06:00
|
|
|
config,
|
2017-06-01 21:58:19 -05:00
|
|
|
is_if_else_block: false,
|
2018-01-21 22:05:18 -06:00
|
|
|
snippet_provider,
|
2017-12-08 01:59:04 -06:00
|
|
|
line_number: 0,
|
2019-09-04 09:00:26 -05:00
|
|
|
skipped_range: Rc::new(RefCell::new(vec![])),
|
2020-11-10 20:07:42 -06:00
|
|
|
is_macro_def: false,
|
2018-06-06 22:32:58 -05:00
|
|
|
macro_rewrite_failure: false,
|
2018-05-14 01:01:53 -05:00
|
|
|
report,
|
2022-07-12 19:31:19 -05:00
|
|
|
skip_context,
|
2015-07-15 20:31:20 -05:00
|
|
|
}
|
2015-04-21 04:01:19 -05:00
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn opt_snippet(&'b self, span: Span) -> Option<&'a str> {
|
2017-12-06 22:51:30 -06:00
|
|
|
self.snippet_provider.span_to_snippet(span)
|
2017-11-10 02:08:57 -06:00
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn snippet(&'b self, span: Span) -> &'a str {
|
2017-12-06 07:49:49 -06:00
|
|
|
self.opt_snippet(span).unwrap()
|
2015-04-21 04:01:19 -05:00
|
|
|
}
|
2015-04-28 03:56:01 -05:00
|
|
|
|
|
|
|
// Returns true if we should skip the following item.
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn visit_attrs(&mut self, attrs: &[ast::Attribute], style: ast::AttrStyle) -> bool {
|
2018-05-14 01:01:53 -05:00
|
|
|
for attr in attrs {
|
2020-09-02 12:36:50 -05:00
|
|
|
if attr.has_name(depr_skip_annotation()) {
|
2020-03-26 21:25:34 -05:00
|
|
|
let file_name = self.parse_sess.span_to_filename(attr.span);
|
2018-05-14 01:01:53 -05:00
|
|
|
self.report.append(
|
|
|
|
file_name,
|
|
|
|
vec![FormattingError::from_span(
|
2018-09-01 15:26:47 -05:00
|
|
|
attr.span,
|
2020-03-26 21:25:34 -05:00
|
|
|
self.parse_sess,
|
2018-05-14 01:01:53 -05:00
|
|
|
ErrorKind::DeprecatedAttr,
|
|
|
|
)],
|
|
|
|
);
|
2020-02-08 22:21:37 -06:00
|
|
|
} else {
|
|
|
|
match &attr.kind {
|
2022-08-11 06:06:11 -05:00
|
|
|
ast::AttrKind::Normal(ref normal)
|
|
|
|
if self.is_unknown_rustfmt_attr(&normal.item.path.segments) =>
|
2020-02-08 22:21:37 -06:00
|
|
|
{
|
2020-03-26 21:25:34 -05:00
|
|
|
let file_name = self.parse_sess.span_to_filename(attr.span);
|
2020-02-08 22:21:37 -06:00
|
|
|
self.report.append(
|
|
|
|
file_name,
|
|
|
|
vec![FormattingError::from_span(
|
|
|
|
attr.span,
|
2020-03-26 21:25:34 -05:00
|
|
|
self.parse_sess,
|
2020-02-08 22:21:37 -06:00
|
|
|
ErrorKind::BadAttr,
|
|
|
|
)],
|
|
|
|
);
|
|
|
|
}
|
|
|
|
_ => (),
|
|
|
|
}
|
2018-05-14 01:01:53 -05:00
|
|
|
}
|
|
|
|
}
|
2017-08-30 05:26:45 -05:00
|
|
|
if contains_skip(attrs) {
|
2015-10-07 23:20:19 -05:00
|
|
|
return true;
|
2015-04-28 22:00:58 -05:00
|
|
|
}
|
2015-10-07 23:20:19 -05:00
|
|
|
|
2017-07-24 10:55:29 -05:00
|
|
|
let attrs: Vec<_> = attrs.iter().filter(|a| a.style == style).cloned().collect();
|
|
|
|
if attrs.is_empty() {
|
2015-10-07 23:20:19 -05:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-08-30 05:26:45 -05:00
|
|
|
let rewrite = attrs.rewrite(&self.get_context(), self.shape());
|
2017-08-30 21:11:52 -05:00
|
|
|
let span = mk_sp(attrs[0].span.lo(), attrs[attrs.len() - 1].span.hi());
|
2017-08-15 10:11:20 -05:00
|
|
|
self.push_rewrite(span, rewrite);
|
|
|
|
|
2015-10-07 23:20:19 -05:00
|
|
|
false
|
2015-04-28 22:00:58 -05:00
|
|
|
}
|
|
|
|
|
2019-03-20 11:33:40 -05:00
|
|
|
fn is_unknown_rustfmt_attr(&self, segments: &[ast::PathSegment]) -> bool {
|
2019-03-16 09:13:10 -05:00
|
|
|
if segments[0].ident.to_string() != "rustfmt" {
|
|
|
|
return false;
|
|
|
|
}
|
2019-07-16 19:40:33 -05:00
|
|
|
!is_skip_attr(segments)
|
2019-03-16 09:13:10 -05:00
|
|
|
}
|
|
|
|
|
2021-07-25 22:57:19 -05:00
|
|
|
fn walk_mod_items(&mut self, items: &[rustc_ast::ptr::P<ast::Item>]) {
|
2021-11-07 20:37:34 -06:00
|
|
|
self.visit_items_with_reordering(&ptr_vec_to_ref_vec(items));
|
2017-09-15 08:31:52 -05:00
|
|
|
}
|
|
|
|
|
2021-01-09 11:23:36 -06:00
|
|
|
fn walk_stmts(&mut self, stmts: &[Stmt<'_>], include_current_empty_semi: bool) {
|
2017-09-15 08:31:52 -05:00
|
|
|
if stmts.is_empty() {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Extract leading `use ...;`.
|
|
|
|
let items: Vec<_> = stmts
|
|
|
|
.iter()
|
2019-06-16 18:53:39 -05:00
|
|
|
.take_while(|stmt| stmt.to_item().map_or(false, is_use_item))
|
|
|
|
.filter_map(|stmt| stmt.to_item())
|
2017-09-15 08:31:52 -05:00
|
|
|
.collect();
|
|
|
|
|
|
|
|
if items.is_empty() {
|
2021-01-09 11:23:36 -06:00
|
|
|
self.visit_stmt(&stmts[0], include_current_empty_semi);
|
|
|
|
|
|
|
|
// FIXME(calebcartwright 2021-01-03) - This exists strictly to maintain legacy
|
|
|
|
// formatting where rustfmt would preserve redundant semicolons on Items in a
|
|
|
|
// statement position.
|
|
|
|
//
|
|
|
|
// Starting in rustc-ap-* v692 (~2020-12-01) the rustc parser now parses this as
|
|
|
|
// two separate statements (Item and Empty kinds), whereas before it was parsed as
|
|
|
|
// a single statement with the statement's span including the redundant semicolon.
|
|
|
|
//
|
|
|
|
// rustfmt typically tosses unnecessary/redundant semicolons, and eventually we
|
|
|
|
// should toss these as well, but doing so at this time would
|
|
|
|
// break the Stability Guarantee
|
|
|
|
// N.B. This could be updated to utilize the version gates.
|
|
|
|
let include_next_empty = if stmts.len() > 1 {
|
2021-07-25 22:57:19 -05:00
|
|
|
matches!(
|
|
|
|
(&stmts[0].as_ast_node().kind, &stmts[1].as_ast_node().kind),
|
|
|
|
(ast::StmtKind::Item(_), ast::StmtKind::Empty)
|
|
|
|
)
|
2021-01-09 11:23:36 -06:00
|
|
|
} else {
|
|
|
|
false
|
|
|
|
};
|
|
|
|
|
|
|
|
self.walk_stmts(&stmts[1..], include_next_empty);
|
2017-09-15 08:31:52 -05:00
|
|
|
} else {
|
2018-02-17 11:06:29 -06:00
|
|
|
self.visit_items_with_reordering(&items);
|
2021-01-09 11:23:36 -06:00
|
|
|
self.walk_stmts(&stmts[items.len()..], false);
|
2017-09-15 08:31:52 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn walk_block_stmts(&mut self, b: &ast::Block) {
|
2021-01-09 11:23:36 -06:00
|
|
|
self.walk_stmts(&Stmt::from_ast_nodes(b.stmts.iter()), false)
|
2017-09-15 08:31:52 -05:00
|
|
|
}
|
|
|
|
|
2017-07-24 10:55:55 -05:00
|
|
|
fn format_mod(
|
|
|
|
&mut self,
|
2021-03-28 16:25:30 -05:00
|
|
|
mod_kind: &ast::ModKind,
|
|
|
|
unsafety: ast::Unsafe,
|
2017-07-24 10:55:55 -05:00
|
|
|
vis: &ast::Visibility,
|
|
|
|
s: Span,
|
2020-05-19 03:31:28 -05:00
|
|
|
ident: symbol::Ident,
|
2017-07-24 10:55:55 -05:00
|
|
|
attrs: &[ast::Attribute],
|
|
|
|
) {
|
2018-06-25 09:36:45 -05:00
|
|
|
let vis_str = utils::format_visibility(&self.get_context(), vis);
|
|
|
|
self.push_str(&*vis_str);
|
2021-03-28 16:25:30 -05:00
|
|
|
self.push_str(format_unsafety(unsafety));
|
2017-12-08 01:59:04 -06:00
|
|
|
self.push_str("mod ");
|
2018-06-25 09:36:45 -05:00
|
|
|
// Calling `to_owned()` to work around borrow checker.
|
|
|
|
let ident_str = rewrite_ident(&self.get_context(), ident).to_owned();
|
|
|
|
self.push_str(&ident_str);
|
2015-07-24 08:29:04 -05:00
|
|
|
|
2022-03-03 17:45:25 -06:00
|
|
|
if let ast::ModKind::Loaded(ref items, ast::Inline::Yes, ref spans) = mod_kind {
|
2022-03-07 15:37:35 -06:00
|
|
|
let ast::ModSpans {
|
2022-03-04 16:05:30 -06:00
|
|
|
inner_span,
|
2022-03-07 15:37:35 -06:00
|
|
|
inject_use_span: _,
|
2022-03-04 16:05:30 -06:00
|
|
|
} = *spans;
|
2017-11-13 19:47:02 -06:00
|
|
|
match self.config.brace_style() {
|
2017-12-08 01:59:04 -06:00
|
|
|
BraceStyle::AlwaysNextLine => {
|
2018-02-18 21:47:54 -06:00
|
|
|
let indent_str = self.block_indent.to_string_with_newline(self.config);
|
|
|
|
self.push_str(&indent_str);
|
|
|
|
self.push_str("{");
|
2017-12-08 01:59:04 -06:00
|
|
|
}
|
|
|
|
_ => self.push_str(" {"),
|
2017-07-20 23:55:15 -05:00
|
|
|
}
|
2016-01-28 00:53:41 -06:00
|
|
|
// Hackery to account for the closing }.
|
2018-02-18 21:41:43 -06:00
|
|
|
let mod_lo = self.snippet_provider.span_after(source!(self, s), "{");
|
2017-08-19 13:47:40 -05:00
|
|
|
let body_snippet =
|
2021-03-28 16:25:30 -05:00
|
|
|
self.snippet(mk_sp(mod_lo, source!(self, inner_span).hi() - BytePos(1)));
|
2016-01-28 00:53:41 -06:00
|
|
|
let body_snippet = body_snippet.trim();
|
|
|
|
if body_snippet.is_empty() {
|
2017-12-08 01:59:04 -06:00
|
|
|
self.push_str("}");
|
2016-01-28 00:53:41 -06:00
|
|
|
} else {
|
|
|
|
self.last_pos = mod_lo;
|
|
|
|
self.block_indent = self.block_indent.block_indent(self.config);
|
2017-07-24 10:55:55 -05:00
|
|
|
self.visit_attrs(attrs, ast::AttrStyle::Inner);
|
2021-03-28 16:25:30 -05:00
|
|
|
self.walk_mod_items(items);
|
|
|
|
let missing_span = self.next_span(inner_span.hi() - BytePos(1));
|
2019-07-17 09:07:12 -05:00
|
|
|
self.close_block(missing_span, false);
|
2016-01-28 00:53:41 -06:00
|
|
|
}
|
2021-03-28 16:25:30 -05:00
|
|
|
self.last_pos = source!(self, inner_span).hi();
|
2015-11-20 15:44:15 -06:00
|
|
|
} else {
|
2017-12-08 01:59:04 -06:00
|
|
|
self.push_str(";");
|
2017-08-19 13:47:40 -05:00
|
|
|
self.last_pos = source!(self, s).hi();
|
2015-07-01 14:13:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-02 18:42:00 -05:00
|
|
|
pub(crate) fn format_separate_mod(&mut self, m: &Module<'_>, end_pos: BytePos) {
|
2015-09-18 23:50:44 -05:00
|
|
|
self.block_indent = Indent::empty();
|
2021-12-29 20:49:39 -06:00
|
|
|
let skipped = self.visit_attrs(m.attrs(), ast::AttrStyle::Inner);
|
|
|
|
assert!(
|
|
|
|
!skipped,
|
|
|
|
"Skipping module must be handled before reaching this line."
|
|
|
|
);
|
|
|
|
self.walk_mod_items(&m.items);
|
|
|
|
self.format_missing_with_indent(end_pos);
|
2015-07-01 14:13:10 -05:00
|
|
|
}
|
2015-07-20 14:33:23 -05:00
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn skip_empty_lines(&mut self, end_pos: BytePos) {
|
2018-05-07 16:25:48 -05:00
|
|
|
while let Some(pos) = self
|
|
|
|
.snippet_provider
|
2019-07-15 08:41:56 -05:00
|
|
|
.opt_span_after(self.next_span(end_pos), "\n")
|
2017-11-10 02:09:31 -06:00
|
|
|
{
|
2019-07-15 08:41:56 -05:00
|
|
|
if let Some(snippet) = self.opt_snippet(self.next_span(pos)) {
|
2017-11-10 02:09:31 -06:00
|
|
|
if snippet.trim().is_empty() {
|
|
|
|
self.last_pos = pos;
|
|
|
|
} else {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn with_context<F>(&mut self, f: F) -> Option<String>
|
2018-06-06 22:32:58 -05:00
|
|
|
where
|
2019-02-09 01:14:30 -06:00
|
|
|
F: Fn(&RewriteContext<'_>) -> Option<String>,
|
2018-06-06 22:32:58 -05:00
|
|
|
{
|
2019-09-18 08:37:08 -05:00
|
|
|
let context = self.get_context();
|
|
|
|
let result = f(&context);
|
2018-10-17 17:45:55 -05:00
|
|
|
|
2019-09-18 08:37:08 -05:00
|
|
|
self.macro_rewrite_failure |= context.macro_rewrite_failure.get();
|
2018-06-06 22:32:58 -05:00
|
|
|
result
|
|
|
|
}
|
|
|
|
|
2019-05-09 13:37:51 -05:00
|
|
|
pub(crate) fn get_context(&self) -> RewriteContext<'_> {
|
2015-08-14 07:09:19 -05:00
|
|
|
RewriteContext {
|
2020-03-26 21:25:34 -05:00
|
|
|
parse_sess: self.parse_sess,
|
2015-08-14 07:09:19 -05:00
|
|
|
config: self.config,
|
2019-09-18 08:37:08 -05:00
|
|
|
inside_macro: Rc::new(Cell::new(false)),
|
|
|
|
use_block: Cell::new(false),
|
|
|
|
is_if_else_block: Cell::new(false),
|
|
|
|
force_one_line_chain: Cell::new(false),
|
2017-12-11 22:48:12 -06:00
|
|
|
snippet_provider: self.snippet_provider,
|
2019-09-18 08:37:08 -05:00
|
|
|
macro_rewrite_failure: Cell::new(false),
|
2020-11-10 20:07:42 -06:00
|
|
|
is_macro_def: self.is_macro_def,
|
2018-05-14 01:01:53 -05:00
|
|
|
report: self.report.clone(),
|
2019-07-16 19:40:33 -05:00
|
|
|
skip_context: self.skip_context.clone(),
|
2019-09-04 09:00:26 -05:00
|
|
|
skipped_range: self.skipped_range.clone(),
|
2019-03-16 09:13:10 -05:00
|
|
|
}
|
|
|
|
}
|
2015-04-22 23:22:48 -05:00
|
|
|
}
|