Rollup of 9 pull requests

compiler/rustc_abi/src/extern_abi.rs

@@ -290,8 +290,8 @@ impl ExternAbi {
     }
 
     /// Returns whether the ABI supports C variadics. This only controls whether we allow *imports*
-    /// of such functions via `extern` blocks; there's a separate check during AST construction
-    /// guarding *definitions* of variadic functions.
+    /// of such functions via `extern` blocks and definition via naked functions; there's a
+    /// separate check during AST construction guarding *definitions* of variadic functions.
     #[cfg(feature = "nightly")]
     pub fn supports_c_variadic(self) -> CVariadicStatus {
         // * C and Cdecl obviously support varargs.

compiler/rustc_ast_lowering/src/contract.rs

@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use rustc_hir::attrs::lang_items::LangItem;
 use thin_vec::thin_vec;
 
 use crate::LoweringContext;
@@ -146,7 +147,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         );
         let precond = self.expr_call_lang_item_fn_mut(
             req_span,
-            rustc_hir::LangItem::ContractCheckRequires,
+            LangItem::ContractCheckRequires,
             &*arena_vec![self; lowered_req],
         );
         self.stmt_expr(req.span, precond)
@@ -165,7 +166,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         let lowered_ens = self.lower_expr_mut(&ens);
         self.expr_call_lang_item_fn(
             ens_span,
-            rustc_hir::LangItem::ContractBuildCheckEnsures,
+            LangItem::ContractBuildCheckEnsures,
             &*arena_vec![self; lowered_ens],
         )
     }
@@ -208,15 +209,15 @@ impl<'hir> LoweringContext<'_, 'hir> {
 
         let postcond_checker = self.arena.alloc(self.expr_enum_variant_lang_item(
             postcond_checker.span,
-            rustc_hir::lang_items::LangItem::OptionSome,
+            rustc_hir::attrs::lang_items::LangItem::OptionSome,
             &*arena_vec![self; *postcond_checker],
         ));
         let then_block_stmts = self.block_all(span, stmts, Some(postcond_checker));
         let then_block = self.arena.alloc(self.expr_block(&then_block_stmts));
 
         let none_expr = self.arena.alloc(self.expr_enum_variant_lang_item(
             postcond_checker.span,
-            rustc_hir::lang_items::LangItem::OptionNone,
+            rustc_hir::attrs::lang_items::LangItem::OptionNone,
             Default::default(),
         ));
         let else_block = self.block_expr(none_expr);
@@ -326,7 +327,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         let cond_fn = self.expr_ident(span, cond_ident, cond_hir_id);
         let contract_check = self.expr_call_lang_item_fn_mut(
             span,
-            rustc_hir::LangItem::ContractCheckEnsures,
+            LangItem::ContractCheckEnsures,
             arena_vec![self; *cond_fn, *ret],
         );
         let contract_check = self.arena.alloc(contract_check);

compiler/rustc_ast_lowering/src/delegation/attributes.rs

@@ -1,5 +1,5 @@
+use rustc_hir as hir;
 use rustc_hir::attrs::{AttributeKind, InlineAttr};
-use rustc_hir::{self as hir};
 use rustc_span::Span;
 use rustc_span::def_id::DefId;
 

compiler/rustc_ast_lowering/src/delegation/mod.rs

@@ -45,6 +45,7 @@ use hir::def::Res;
 use rustc_abi::ExternAbi;
 use rustc_ast as ast;
 use rustc_ast::*;
+use rustc_hir::attrs::lang_items::LangItem;
 use rustc_hir::def::DefKind;
 use rustc_hir::{self as hir, FnDeclFlags};
 use rustc_middle::ty::Asyncness;
@@ -341,8 +342,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 crate::re_lowering::ReloweringChecker::allow_relowering(self, |this| {
                     this.lower_block_noalloc(HirId::INVALID, block, false)
                 })
-            },
-            _ => self.lower_block_noalloc(HirId::INVALID, block, false)
+            }
+            _ => self.lower_block_noalloc(HirId::INVALID, block, false),
         };
 
         // Remove node ids for which we overwrote resolution to generated param
@@ -456,7 +457,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
 
             let expr = self.mk_expr(initializer, span);
 
-            let path = self.make_lang_item_qpath(hir::LangItem::FromFn, span, None);
+            let path = self.make_lang_item_qpath(LangItem::FromFn, span, None);
             let path = self.arena.alloc(self.mk_expr(hir::ExprKind::Path(path), span));
 
             let call = hir::ExprKind::Call(path, self.arena.alloc_slice(&[expr]));