mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #107372 - JohnTitor:rollup-zkl2ges, r=JohnTitor

Browse Source 
Rollup of 9 pull requests

Successful merges:

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

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2023-01-27 17:49:56 +00:00
commit bcb90528c0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clippy_utils/src/macros.rs
View File

@ -711,8 +711,8 @@ pub struct FormatSpec<'tcx> {
pub fill: Option<char>, pub fill: Option<char>,
/// Optionally specified alignment. /// Optionally specified alignment.
pub align: Alignment, pub align: Alignment,
/// Packed version of various flags provided, see [`rustc_parse_format::Flag`]. /// Whether all flag options are set to default (no flags specified).
pub flags: u32, pub no_flags: bool,
/// Represents either the maximum width or the integer precision. /// Represents either the maximum width or the integer precision.
pub precision: Count<'tcx>, pub precision: Count<'tcx>,
/// The minimum width, will be padded according to `width`/`align` /// The minimum width, will be padded according to `width`/`align`
@ -728,7 +728,7 @@ fn new(spec: rpf::FormatSpec<'_>, positions: ParamPosition, values: &FormatArgsV
Some(Self { Some(Self {
fill: spec.fill, fill: spec.fill,
align: spec.align, 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( precision: Count::new(
FormatParamUsage::Precision, FormatParamUsage::Precision,
spec.precision, spec.precision,
@ -773,7 +773,7 @@ pub fn is_default_for_trait(&self) -> bool {
self.width.is_implied() self.width.is_implied()
&& self.precision.is_implied() && self.precision.is_implied()
&& self.align == Alignment::AlignUnknown && self.align == Alignment::AlignUnknown
&& self.flags == 0 && self.no_flags
} }
} }