dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More general captures 

This avoids repetition
This commit is contained in:
est31 2023-03-22 15:38:55 +01:00
parent febd59e122
commit edd7d4a9f7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_codegen_llvm/src/llvm_util.rs
View File

@ -424,7 +424,7 @@ pub(crate) fn global_llvm_features(sess: &Session, diagnostics: bool) -> Vec<Str
.filter_map(|s| { .filter_map(|s| {
let enable_disable = match s.chars().next() { let enable_disable = match s.chars().next() {
None => return None, None => return None,
Some(c @ '+' | c @ '-') => c, Some(c @ ('+' | '-')) => c,
Some(_) => { Some(_) => {
if diagnostics { if diagnostics {
sess.emit_warning(UnknownCTargetFeaturePrefix { feature: s }); sess.emit_warning(UnknownCTargetFeaturePrefix { feature: s });

2
compiler/rustc_hir_typeck/src/expr.rs
View File

@ -231,7 +231,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let ty = ensure_sufficient_stack(|| match &expr.kind { let ty = ensure_sufficient_stack(|| match &expr.kind {
hir::ExprKind::Path( hir::ExprKind::Path(
qpath @ hir::QPath::Resolved(..) | qpath @ hir::QPath::TypeRelative(..), qpath @ (hir::QPath::Resolved(..) | hir::QPath::TypeRelative(..)),
) => self.check_expr_path(qpath, expr, args), ) => self.check_expr_path(qpath, expr, args),
_ => self.check_expr_kind(expr, expected), _ => self.check_expr_kind(expr, expected),
}); });

2
compiler/rustc_resolve/src/macros.rs
View File

@ -703,7 +703,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
PathResult::NonModule(path_res) if let Some(res) = path_res.full_res() => { PathResult::NonModule(path_res) if let Some(res) = path_res.full_res() => {
check_consistency(self, &path, path_span, kind, initial_res, res) check_consistency(self, &path, path_span, kind, initial_res, res)
} }
path_res @ PathResult::NonModule(..) | path_res @ PathResult::Failed { .. } => { path_res @ (PathResult::NonModule(..) | PathResult::Failed { .. }) => {
let mut suggestion = None; let mut suggestion = None;
let (span, label) = if let PathResult::Failed { span, label, .. } = path_res { let (span, label) = if let PathResult::Failed { span, label, .. } = path_res {
// try to suggest if it's not a macro, maybe a function // try to suggest if it's not a macro, maybe a function