Skip to content

Commit

Permalink
Nits
Browse files Browse the repository at this point in the history
  • Loading branch information
compiler-errors committed Feb 16, 2024
1 parent a9dbf63 commit f624d55
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
1 change: 1 addition & 0 deletions compiler/rustc_infer/src/traits/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ impl<'tcx, T: ?Sized + TraitEngine<'tcx>> T {
}
}

#[must_use]
fn select_all_or_error(&mut self, infcx: &InferCtxt<'tcx>) -> Vec<FulfillmentError<'tcx>> {
let errors = self.select_where_possible(infcx);
if !errors.is_empty() {
Expand Down
9 changes: 8 additions & 1 deletion compiler/rustc_macros/src/extension.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,14 @@ pub(crate) fn extension(

/// Only keep `#[doc]` attrs.
fn scrub_attrs(attrs: &[Attribute]) -> Vec<Attribute> {
attrs.into_iter().cloned().filter(|attr| attr.path().segments[0].ident == "doc").collect()
attrs
.into_iter()
.cloned()
.filter(|attr| {
let ident = &attr.path().segments[0].ident;
ident == "doc" || ident == "must_use"
})
.collect()
}

/// Scrub arguments so that they're valid for trait signatures.
Expand Down
6 changes: 6 additions & 0 deletions compiler/rustc_trait_selection/src/traits/query/normalize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ impl<'cx, 'tcx> At<'cx, 'tcx> {
/// normalizing, but for now should be used only when we actually
/// know that normalization will succeed, since error reporting
/// and other details are still "under development".
///
/// This normalization should *only* be used when the projection does not
/// have possible ambiguity or may not be well-formed.
///
/// After codegen, when lifetimes do not matter, it is preferable to instead
/// use [`TyCtxt::normalize_erasing_regions`], which wraps this procedure.
fn query_normalize<T>(self, value: T) -> Result<Normalized<'tcx, T>, NoSolution>
where
T: TypeFoldable<TyCtxt<'tcx>>,
Expand Down

0 comments on commit f624d55

Please sign in to comment.