mirror of
https://github.com/astral-sh/ruff.git
synced 2025-08-03 10:22:24 +00:00
Run rustfmt
on nightly to clean up erroneous comments (#5106)
## Summary This PR runs `rustfmt` with a few nightly options as a one-time fix to catch some malformatted comments. I ended up just running with: ```toml condense_wildcard_suffixes = true edition = "2021" max_width = 100 normalize_comments = true normalize_doc_attributes = true reorder_impl_items = true unstable_features = true use_field_init_shorthand = true ``` Since these all seem like reasonable things to fix, so may as well while I'm here.
This commit is contained in:
parent
9ab16fb417
commit
716cab2f19
32 changed files with 49 additions and 34 deletions
|
@ -205,8 +205,8 @@ impl<'a> SectionContexts<'a> {
|
|||
}
|
||||
|
||||
impl<'a> IntoIterator for &'a SectionContexts<'a> {
|
||||
type Item = SectionContext<'a>;
|
||||
type IntoIter = SectionContextsIter<'a>;
|
||||
type Item = SectionContext<'a>;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.iter()
|
||||
|
|
|
@ -60,7 +60,7 @@ impl Display for Diff<'_> {
|
|||
Applicability::Automatic => "Fix",
|
||||
Applicability::Suggested => "Suggested fix",
|
||||
Applicability::Manual => "Possible fix",
|
||||
Applicability::Unspecified => "Suggested fix", // For backwards compatibility, unspecified fixes are 'suggested'
|
||||
Applicability::Unspecified => "Suggested fix", /* For backwards compatibility, unspecified fixes are 'suggested' */
|
||||
};
|
||||
writeln!(f, "ℹ {}", message.blue())?;
|
||||
|
||||
|
|
|
@ -94,6 +94,7 @@ struct MessageWithLocation<'a> {
|
|||
|
||||
impl Deref for MessageWithLocation<'_> {
|
||||
type Target = Message;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
self.message
|
||||
}
|
||||
|
|
|
@ -13,7 +13,6 @@ pub struct RuleSet([u64; RULESET_SIZE]);
|
|||
|
||||
impl RuleSet {
|
||||
const EMPTY: [u64; RULESET_SIZE] = [0; RULESET_SIZE];
|
||||
|
||||
// 64 fits into a u16 without truncation
|
||||
#[allow(clippy::cast_possible_truncation)]
|
||||
const SLICE_BITS: u16 = u64::BITS as u16;
|
||||
|
@ -290,8 +289,8 @@ impl Extend<Rule> for RuleSet {
|
|||
}
|
||||
|
||||
impl IntoIterator for RuleSet {
|
||||
type Item = Rule;
|
||||
type IntoIter = RuleSetIterator;
|
||||
type Item = Rule;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.iter()
|
||||
|
@ -299,8 +298,8 @@ impl IntoIterator for RuleSet {
|
|||
}
|
||||
|
||||
impl IntoIterator for &RuleSet {
|
||||
type Item = Rule;
|
||||
type IntoIter = RuleSetIterator;
|
||||
type Item = Rule;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.iter()
|
||||
|
|
|
@ -145,8 +145,8 @@ impl From<RuleCodePrefix> for RuleSelector {
|
|||
}
|
||||
|
||||
impl IntoIterator for &RuleSelector {
|
||||
type Item = Rule;
|
||||
type IntoIter = RuleSelectorIter;
|
||||
type Item = Rule;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
match self {
|
||||
|
|
|
@ -20,7 +20,7 @@ use crate::rules::pep8_naming::helpers;
|
|||
/// > Modules that are designed for use via from M import * should use the
|
||||
/// __all__ mechanism to prevent exporting globals, or use the older
|
||||
/// convention of prefixing such globals with an underscore (which you might
|
||||
///want to do to indicate these globals are “module non-public”).
|
||||
/// want to do to indicate these globals are “module non-public”).
|
||||
/// >
|
||||
/// > ### Function and Variable Names
|
||||
/// > Function names should be lowercase, with words separated by underscores
|
||||
|
|
|
@ -82,7 +82,6 @@ impl Violation for IndentationWithInvalidMultipleComment {
|
|||
/// ```python
|
||||
/// for item in items:
|
||||
/// pass
|
||||
///
|
||||
/// ```
|
||||
///
|
||||
/// Use instead:
|
||||
|
|
|
@ -95,8 +95,8 @@ impl Debug for LogicalLines<'_> {
|
|||
}
|
||||
|
||||
impl<'a> IntoIterator for &'a LogicalLines<'a> {
|
||||
type Item = LogicalLine<'a>;
|
||||
type IntoIter = LogicalLinesIter<'a>;
|
||||
type Item = LogicalLine<'a>;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
LogicalLinesIter {
|
||||
|
|
|
@ -41,7 +41,6 @@ impl Violation for MultipleSpacesAfterKeyword {
|
|||
/// ## Example
|
||||
/// ```python
|
||||
/// True and False
|
||||
///
|
||||
/// ```
|
||||
///
|
||||
/// Use instead:
|
||||
|
@ -67,7 +66,6 @@ impl Violation for MultipleSpacesBeforeKeyword {
|
|||
/// ## Example
|
||||
/// ```python
|
||||
/// True and\tFalse
|
||||
///
|
||||
/// ```
|
||||
///
|
||||
/// Use instead:
|
||||
|
@ -93,7 +91,6 @@ impl Violation for TabAfterKeyword {
|
|||
/// ## Example
|
||||
/// ```python
|
||||
/// True\tand False
|
||||
///
|
||||
/// ```
|
||||
///
|
||||
/// Use instead:
|
||||
|
|
|
@ -116,7 +116,6 @@ impl Violation for NoSpaceAfterBlockComment {
|
|||
/// ## Example
|
||||
/// ```python
|
||||
/// ### Block comment
|
||||
///
|
||||
/// ```
|
||||
///
|
||||
/// Use instead:
|
||||
|
|
|
@ -50,7 +50,6 @@ impl AlwaysAutofixableViolation for TrailingWhitespace {
|
|||
/// ## Example
|
||||
/// ```python
|
||||
/// class Foo(object):\n \n bang = 12
|
||||
///
|
||||
/// ```
|
||||
///
|
||||
/// Use instead:
|
||||
|
|
|
@ -70,7 +70,7 @@ impl OptionGroup {
|
|||
///
|
||||
/// ### Find a nested options
|
||||
///
|
||||
///```rust
|
||||
/// ```rust
|
||||
/// # use ruff::settings::options_base::{OptionGroup, OptionEntry, OptionField};
|
||||
///
|
||||
/// const ignore_options: [(&'static str, OptionEntry); 2] = [
|
||||
|
@ -134,8 +134,8 @@ impl OptionGroup {
|
|||
}
|
||||
|
||||
impl<'a> IntoIterator for &'a OptionGroup {
|
||||
type Item = &'a (&'a str, OptionEntry);
|
||||
type IntoIter = std::slice::Iter<'a, (&'a str, OptionEntry)>;
|
||||
type Item = &'a (&'a str, OptionEntry);
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.0.iter()
|
||||
|
@ -143,8 +143,8 @@ impl<'a> IntoIterator for &'a OptionGroup {
|
|||
}
|
||||
|
||||
impl IntoIterator for OptionGroup {
|
||||
type Item = &'static (&'static str, OptionEntry);
|
||||
type IntoIter = std::slice::Iter<'static, (&'static str, OptionEntry)>;
|
||||
type Item = &'static (&'static str, OptionEntry);
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.0.iter()
|
||||
|
|
|
@ -24,6 +24,7 @@ impl CacheKeyHasher {
|
|||
|
||||
impl Deref for CacheKeyHasher {
|
||||
type Target = DefaultHasher;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.inner
|
||||
}
|
||||
|
|
|
@ -29,7 +29,6 @@ pub trait Buffer {
|
|||
///
|
||||
/// assert_eq!(buffer.into_vec(), vec![FormatElement::StaticText { text: "test" }]);
|
||||
/// ```
|
||||
///
|
||||
fn write_element(&mut self, element: FormatElement) -> FormatResult<()>;
|
||||
|
||||
/// Returns a slice containing all elements written into this buffer.
|
||||
|
|
|
@ -57,7 +57,6 @@ pub trait MemoizeFormat<Context> {
|
|||
/// # Ok(())
|
||||
/// # }
|
||||
/// ```
|
||||
///
|
||||
fn memoized(self) -> Memoized<Self, Context>
|
||||
where
|
||||
Self: Sized + Format<Context>,
|
||||
|
@ -142,7 +141,6 @@ where
|
|||
/// assert_eq!("Counter:\n\tCount: 0\nCount: 0\n", formatted.print()?.as_code());
|
||||
/// # Ok(())
|
||||
/// # }
|
||||
///
|
||||
/// ```
|
||||
pub fn inspect(&mut self, f: &mut Formatter<Context>) -> FormatResult<&[FormatElement]> {
|
||||
let result = self
|
||||
|
|
|
@ -721,7 +721,6 @@ where
|
|||
/// # Ok(())
|
||||
/// # }
|
||||
/// ```
|
||||
///
|
||||
#[inline(always)]
|
||||
pub fn write<Context>(
|
||||
output: &mut dyn Buffer<Context = Context>,
|
||||
|
|
|
@ -127,8 +127,8 @@ impl<I: Idx, T> IndexMut<I> for IndexSlice<I, T> {
|
|||
}
|
||||
|
||||
impl<'a, I: Idx, T> IntoIterator for &'a IndexSlice<I, T> {
|
||||
type Item = &'a T;
|
||||
type IntoIter = std::slice::Iter<'a, T>;
|
||||
type Item = &'a T;
|
||||
|
||||
#[inline]
|
||||
fn into_iter(self) -> std::slice::Iter<'a, T> {
|
||||
|
@ -137,8 +137,8 @@ impl<'a, I: Idx, T> IntoIterator for &'a IndexSlice<I, T> {
|
|||
}
|
||||
|
||||
impl<'a, I: Idx, T> IntoIterator for &'a mut IndexSlice<I, T> {
|
||||
type Item = &'a mut T;
|
||||
type IntoIter = std::slice::IterMut<'a, T>;
|
||||
type Item = &'a mut T;
|
||||
|
||||
#[inline]
|
||||
fn into_iter(self) -> std::slice::IterMut<'a, T> {
|
||||
|
|
|
@ -121,8 +121,8 @@ impl<I: Idx, T> FromIterator<T> for IndexVec<I, T> {
|
|||
}
|
||||
|
||||
impl<I: Idx, T> IntoIterator for IndexVec<I, T> {
|
||||
type Item = T;
|
||||
type IntoIter = std::vec::IntoIter<T>;
|
||||
type Item = T;
|
||||
|
||||
#[inline]
|
||||
fn into_iter(self) -> std::vec::IntoIter<T> {
|
||||
|
@ -131,8 +131,8 @@ impl<I: Idx, T> IntoIterator for IndexVec<I, T> {
|
|||
}
|
||||
|
||||
impl<'a, I: Idx, T> IntoIterator for &'a IndexVec<I, T> {
|
||||
type Item = &'a T;
|
||||
type IntoIter = std::slice::Iter<'a, T>;
|
||||
type Item = &'a T;
|
||||
|
||||
#[inline]
|
||||
fn into_iter(self) -> std::slice::Iter<'a, T> {
|
||||
|
@ -141,8 +141,8 @@ impl<'a, I: Idx, T> IntoIterator for &'a IndexVec<I, T> {
|
|||
}
|
||||
|
||||
impl<'a, I: Idx, T> IntoIterator for &'a mut IndexVec<I, T> {
|
||||
type Item = &'a mut T;
|
||||
type IntoIter = std::slice::IterMut<'a, T>;
|
||||
type Item = &'a mut T;
|
||||
|
||||
#[inline]
|
||||
fn into_iter(self) -> std::slice::IterMut<'a, T> {
|
||||
|
|
|
@ -160,8 +160,8 @@ impl ImportMap {
|
|||
}
|
||||
|
||||
impl<'a> IntoIterator for &'a ImportMap {
|
||||
type Item = (&'a String, &'a Vec<ModuleImport>);
|
||||
type IntoIter = std::collections::hash_map::Iter<'a, String, Vec<ModuleImport>>;
|
||||
type Item = (&'a String, &'a Vec<ModuleImport>);
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.module_to_imports.iter()
|
||||
|
|
|
@ -25,8 +25,8 @@ impl Debug for CommentRanges {
|
|||
}
|
||||
|
||||
impl<'a> IntoIterator for &'a CommentRanges {
|
||||
type Item = &'a TextRange;
|
||||
type IntoIter = std::slice::Iter<'a, TextRange>;
|
||||
type Item = &'a TextRange;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.raw.iter()
|
||||
|
|
|
@ -245,12 +245,11 @@ impl IndexKind {
|
|||
pub struct OneIndexed(NonZeroUsize);
|
||||
|
||||
impl OneIndexed {
|
||||
/// The largest value that can be represented by this integer type
|
||||
pub const MAX: Self = unwrap(Self::new(usize::MAX));
|
||||
// SAFETY: These constants are being initialized with non-zero values
|
||||
/// The smallest value that can be represented by this integer type.
|
||||
pub const MIN: Self = unwrap(Self::new(1));
|
||||
/// The largest value that can be represented by this integer type
|
||||
pub const MAX: Self = unwrap(Self::new(usize::MAX));
|
||||
|
||||
pub const ONE: NonZeroUsize = unwrap(NonZeroUsize::new(1));
|
||||
|
||||
/// Creates a non-zero if the given value is not zero.
|
||||
|
|
|
@ -1078,23 +1078,29 @@ class A:
|
|||
walk_expr(self, expr);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_expr(&mut self, expr: &Expr) {
|
||||
self.enter_node(expr);
|
||||
walk_expr(self, expr);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_constant(&mut self, constant: &Constant) {
|
||||
self.emit(&constant);
|
||||
}
|
||||
|
||||
fn visit_boolop(&mut self, boolop: &Boolop) {
|
||||
self.emit(&boolop);
|
||||
}
|
||||
|
||||
fn visit_operator(&mut self, operator: &Operator) {
|
||||
self.emit(&operator);
|
||||
}
|
||||
|
||||
fn visit_unaryop(&mut self, unaryop: &Unaryop) {
|
||||
self.emit(&unaryop);
|
||||
}
|
||||
|
||||
fn visit_cmpop(&mut self, cmpop: &Cmpop) {
|
||||
self.emit(&cmpop);
|
||||
}
|
||||
|
@ -1104,51 +1110,61 @@ class A:
|
|||
walk_comprehension(self, comprehension);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_excepthandler(&mut self, excepthandler: &Excepthandler) {
|
||||
self.enter_node(excepthandler);
|
||||
walk_excepthandler(self, excepthandler);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_format_spec(&mut self, format_spec: &Expr) {
|
||||
self.enter_node(format_spec);
|
||||
walk_expr(self, format_spec);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_arguments(&mut self, arguments: &Arguments) {
|
||||
self.enter_node(arguments);
|
||||
walk_arguments(self, arguments);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_arg(&mut self, arg: &Arg) {
|
||||
self.enter_node(arg);
|
||||
walk_arg(self, arg);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_keyword(&mut self, keyword: &Keyword) {
|
||||
self.enter_node(keyword);
|
||||
walk_keyword(self, keyword);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_alias(&mut self, alias: &Alias) {
|
||||
self.enter_node(alias);
|
||||
walk_alias(self, alias);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_withitem(&mut self, withitem: &Withitem) {
|
||||
self.enter_node(withitem);
|
||||
walk_withitem(self, withitem);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_match_case(&mut self, match_case: &MatchCase) {
|
||||
self.enter_node(match_case);
|
||||
walk_match_case(self, match_case);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_pattern(&mut self, pattern: &Pattern) {
|
||||
self.enter_node(pattern);
|
||||
walk_pattern(self, pattern);
|
||||
self.exit_node();
|
||||
}
|
||||
|
||||
fn visit_type_ignore(&mut self, type_ignore: &TypeIgnore) {
|
||||
self.enter_node(type_ignore);
|
||||
walk_type_ignore(self, type_ignore);
|
||||
|
|
|
@ -656,7 +656,7 @@ fn handle_positional_only_arguments_separator_comment<'a>(
|
|||
/// Handles comments between the left side and the operator of a binary expression (trailing comments of the left),
|
||||
/// and trailing end-of-line comments that are on the same line as the operator.
|
||||
///
|
||||
///```python
|
||||
/// ```python
|
||||
/// a = (
|
||||
/// 5 # trailing left comment
|
||||
/// + # trailing operator comment
|
||||
|
|
|
@ -257,6 +257,7 @@ impl<'ast> PreorderVisitor<'ast> for CommentsVisitor<'ast> {
|
|||
|
||||
self.finish_node(withitem);
|
||||
}
|
||||
|
||||
fn visit_match_case(&mut self, match_case: &'ast MatchCase) {
|
||||
if self.start_node(match_case).is_traverse() {
|
||||
walk_match_case(self, match_case);
|
||||
|
|
|
@ -142,6 +142,7 @@ impl<'ast> AsFormat<PyFormatContext<'ast>> for Operator {
|
|||
|
||||
impl<'ast> IntoFormat<PyFormatContext<'ast>> for Operator {
|
||||
type Format = FormatOwnedWithRule<Operator, FormatOperator, PyFormatContext<'ast>>;
|
||||
|
||||
fn into_format(self) -> Self::Format {
|
||||
FormatOwnedWithRule::new(self, FormatOperator)
|
||||
}
|
||||
|
|
|
@ -163,6 +163,7 @@ impl NeedsParentheses for Expr {
|
|||
|
||||
impl<'ast> AsFormat<PyFormatContext<'ast>> for Expr {
|
||||
type Format<'a> = FormatRefWithRule<'a, Expr, FormatExpr, PyFormatContext<'ast>>;
|
||||
|
||||
fn format(&self) -> Self::Format<'_> {
|
||||
FormatRefWithRule::new(self, FormatExpr::default())
|
||||
}
|
||||
|
@ -170,6 +171,7 @@ impl<'ast> AsFormat<PyFormatContext<'ast>> for Expr {
|
|||
|
||||
impl<'ast> IntoFormat<PyFormatContext<'ast>> for Expr {
|
||||
type Format = FormatOwnedWithRule<Expr, FormatExpr, PyFormatContext<'ast>>;
|
||||
|
||||
fn into_format(self) -> Self::Format {
|
||||
FormatOwnedWithRule::new(self, FormatExpr::default())
|
||||
}
|
||||
|
|
|
@ -24,6 +24,7 @@ impl FormatRule<Mod, PyFormatContext<'_>> for FormatMod {
|
|||
|
||||
impl<'ast> AsFormat<PyFormatContext<'ast>> for Mod {
|
||||
type Format<'a> = FormatRefWithRule<'a, Mod, FormatMod, PyFormatContext<'ast>>;
|
||||
|
||||
fn format(&self) -> Self::Format<'_> {
|
||||
FormatRefWithRule::new(self, FormatMod::default())
|
||||
}
|
||||
|
@ -31,6 +32,7 @@ impl<'ast> AsFormat<PyFormatContext<'ast>> for Mod {
|
|||
|
||||
impl<'ast> IntoFormat<PyFormatContext<'ast>> for Mod {
|
||||
type Format = FormatOwnedWithRule<Mod, FormatMod, PyFormatContext<'ast>>;
|
||||
|
||||
fn into_format(self) -> Self::Format {
|
||||
FormatOwnedWithRule::new(self, FormatMod::default())
|
||||
}
|
||||
|
|
|
@ -70,6 +70,7 @@ impl FormatRule<Stmt, PyFormatContext<'_>> for FormatStmt {
|
|||
|
||||
impl<'ast> AsFormat<PyFormatContext<'ast>> for Stmt {
|
||||
type Format<'a> = FormatRefWithRule<'a, Stmt, FormatStmt, PyFormatContext<'ast>>;
|
||||
|
||||
fn format(&self) -> Self::Format<'_> {
|
||||
FormatRefWithRule::new(self, FormatStmt::default())
|
||||
}
|
||||
|
@ -77,6 +78,7 @@ impl<'ast> AsFormat<PyFormatContext<'ast>> for Stmt {
|
|||
|
||||
impl<'ast> IntoFormat<PyFormatContext<'ast>> for Stmt {
|
||||
type Format = FormatOwnedWithRule<Stmt, FormatStmt, PyFormatContext<'ast>>;
|
||||
|
||||
fn into_format(self) -> Self::Format {
|
||||
FormatOwnedWithRule::new(self, FormatStmt::default())
|
||||
}
|
||||
|
|
|
@ -7,7 +7,6 @@ use ruff_formatter::{write, Buffer, Format, FormatResult};
|
|||
use ruff_python_ast::prelude::Expr;
|
||||
use rustpython_parser::ast::StmtAssign;
|
||||
|
||||
//
|
||||
// Note: This currently does wrap but not the black way so the types below likely need to be
|
||||
// replaced entirely
|
||||
//
|
||||
|
|
|
@ -178,6 +178,7 @@ impl<'ast> AsFormat<PyFormatContext<'ast>> for Suite {
|
|||
|
||||
impl<'ast> IntoFormat<PyFormatContext<'ast>> for Suite {
|
||||
type Format = FormatOwnedWithRule<Suite, FormatSuite, PyFormatContext<'ast>>;
|
||||
|
||||
fn into_format(self) -> Self::Format {
|
||||
FormatOwnedWithRule::new(self, FormatSuite::default())
|
||||
}
|
||||
|
|
|
@ -202,8 +202,8 @@ impl<'a> Deref for Definitions<'a> {
|
|||
}
|
||||
|
||||
impl<'a> IntoIterator for Definitions<'a> {
|
||||
type Item = Definition<'a>;
|
||||
type IntoIter = std::vec::IntoIter<Self::Item>;
|
||||
type Item = Definition<'a>;
|
||||
|
||||
fn into_iter(self) -> Self::IntoIter {
|
||||
self.0.into_iter()
|
||||
|
|
|
@ -250,6 +250,7 @@ impl Default for Scopes<'_> {
|
|||
|
||||
impl<'a> Deref for Scopes<'a> {
|
||||
type Target = IndexSlice<ScopeId, Scope<'a>>;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.0
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue