Skip to content

Commit

Permalink
Auto merge of rust-lang#107372 - JohnTitor:rollup-zkl2ges, r=JohnTitor
Browse files Browse the repository at this point in the history
Rollup of 9 pull requests

Successful merges:

 - rust-lang#106806 (Replace format flags u32 by enums and bools.)
 - rust-lang#107194 (Remove dependency on slice_internals feature in rustc_ast)
 - rust-lang#107234 (Revisit fix_is_ci_llvm_available logic)
 - rust-lang#107316 (Update snap from `1.0.1` to `1.1.0`)
 - rust-lang#107321 (solver comments + remove `TyCtxt::evaluate_goal`)
 - rust-lang#107332 (Fix wording from `rustbuild` to `bootstrap`)
 - rust-lang#107347 (reduce rightward-drift)
 - rust-lang#107352 (compiler: Fix E0587 explanation)
 - rust-lang#107357 (Fix infinite loop in rustdoc get_all_import_attributes function)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
  • Loading branch information
bors committed Jan 27, 2023
2 parents afb586f + b64a209 commit bcb9052
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions clippy_utils/src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -711,8 +711,8 @@ pub struct FormatSpec<'tcx> {
pub fill: Option<char>,
/// Optionally specified alignment.
pub align: Alignment,
/// Packed version of various flags provided, see [`rustc_parse_format::Flag`].
pub flags: u32,
/// Whether all flag options are set to default (no flags specified).
pub no_flags: bool,
/// Represents either the maximum width or the integer precision.
pub precision: Count<'tcx>,
/// The minimum width, will be padded according to `width`/`align`
Expand All @@ -728,7 +728,7 @@ impl<'tcx> FormatSpec<'tcx> {
Some(Self {
fill: spec.fill,
align: spec.align,
flags: spec.flags,
no_flags: spec.sign.is_none() && !spec.alternate && !spec.zero_pad && spec.debug_hex.is_none(),
precision: Count::new(
FormatParamUsage::Precision,
spec.precision,
Expand Down Expand Up @@ -773,7 +773,7 @@ impl<'tcx> FormatSpec<'tcx> {
self.width.is_implied()
&& self.precision.is_implied()
&& self.align == Alignment::AlignUnknown
&& self.flags == 0
&& self.no_flags
}
}

Expand Down

0 comments on commit bcb9052

Please sign in to comment.