crablang
diff --git a/‎.github/workflows/ci.yml
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/ci.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎Cargo.lock
Lines changed: 15 additions & 19 deletions b/‎Cargo.lock
Lines changed: 15 additions & 19 deletions
diff --git a/‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
Lines changed: 0 additions & 67 deletions b/‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
Lines changed: 0 additions & 67 deletions
diff --git a/‎compiler/rustc_codegen_llvm/src/back/write.rs
Lines changed: 6 additions & 6 deletions b/‎compiler/rustc_codegen_llvm/src/back/write.rs
Lines changed: 6 additions & 6 deletions
diff --git a/‎compiler/rustc_codegen_llvm/src/context.rs
Lines changed: 0 additions & 1 deletion b/‎compiler/rustc_codegen_llvm/src/context.rs
Lines changed: 0 additions & 1 deletion
diff --git a/‎compiler/rustc_codegen_ssa/src/back/metadata.rs
Lines changed: 5 additions & 0 deletions b/‎compiler/rustc_codegen_ssa/src/back/metadata.rs
Lines changed: 5 additions & 0 deletions
diff --git a/‎compiler/rustc_const_eval/src/const_eval/mod.rs
Lines changed: 5 additions & 5 deletions b/‎compiler/rustc_const_eval/src/const_eval/mod.rs
Lines changed: 5 additions & 5 deletions
diff --git a/‎compiler/rustc_const_eval/src/util/check_validity_requirement.rs
Lines changed: 1 addition & 1 deletion b/‎compiler/rustc_const_eval/src/util/check_validity_requirement.rs
Lines changed: 1 addition & 1 deletion
diff --git a/‎compiler/rustc_driver_impl/src/lib.rs
Lines changed: 2 additions & 2 deletions b/‎compiler/rustc_driver_impl/src/lib.rs
Lines changed: 2 additions & 2 deletions
@@ -31,7 +31,7 @@ defaults:
   run:
     shell: bash
 concurrency:
-  group: "${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
+  group: "${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
   cancel-in-progress: true
 jobs:
   pr:
 
@@ -448,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.3.10"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a"
+checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -465,6 +465,7 @@ checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d"
 dependencies = [
  "anstream",
  "anstyle",
+ "bitflags",
  "clap_lex",
  "once_cell",
  "strsim",
@@ -482,9 +483,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.3.2"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
+checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -494,14 +495,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.5.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
 
 [[package]]
 name = "clippy"
 version = "0.1.72"
 dependencies = [
+ "clap",
  "clippy_lints",
  "filetime",
  "itertools",
@@ -519,7 +521,7 @@ dependencies = [
 name = "clippy_dev"
 version = "0.0.1"
 dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick",
  "clap",
  "indoc",
  "itertools",
@@ -637,9 +639,9 @@ dependencies = [
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.95"
+version = "0.1.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6866e0f3638013234db3c89ead7a14d278354338e7237257407500009012b23f"
+checksum = "76630810d973ecea3dbf611e1b7aecfb1012751ef1ff8de3998f89014a166781"
 dependencies = [
  "cc",
  "rustc-std-workspace-core",
@@ -2258,12 +2260,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "owo-colors"
 version = "3.5.0"
@@ -2503,9 +2499,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.63"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
+checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
 dependencies = [
  "unicode-ident",
 ]
@@ -3995,8 +3991,8 @@ dependencies = [
 name = "rustc_target"
 version = "0.0.0"
 dependencies = [
- "bitflags 1.3.2",
- "object",
+ "bitflags",
+ "object 0.31.1",
  "rustc_abi",
  "rustc_data_structures",
  "rustc_feature",
 
@@ -1284,73 +1284,6 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         }
     }
 
-    /// Suggest using `while let` for call `next` on an iterator in a for loop.
-    ///
-    /// For example:
-    /// ```ignore (illustrative)
-    ///
-    /// for x in iter {
-    ///     ...
-    ///     iter.next()
-    /// }
-    /// ```
-    pub(crate) fn explain_iterator_advancement_in_for_loop_if_applicable(
-        &self,
-        err: &mut Diagnostic,
-        span: Span,
-        issued_spans: &UseSpans<'tcx>,
-    ) {
-        let issue_span = issued_spans.args_or_use();
-        let tcx = self.infcx.tcx;
-        let hir = tcx.hir();
-
-        let Some(body_id) = hir.get(self.mir_hir_id()).body_id() else { return };
-        let typeck_results = tcx.typeck(self.mir_def_id());
-
-        struct ExprFinder<'hir> {
-            issue_span: Span,
-            expr_span: Span,
-            body_expr: Option<&'hir hir::Expr<'hir>>,
-            loop_bind: Option<Symbol>,
-        }
-        impl<'hir> Visitor<'hir> for ExprFinder<'hir> {
-            fn visit_expr(&mut self, ex: &'hir hir::Expr<'hir>) {
-                if let hir::ExprKind::Loop(hir::Block{ stmts: [stmt, ..], ..}, _, hir::LoopSource::ForLoop, _) = ex.kind &&
-                    let hir::StmtKind::Expr(hir::Expr{ kind: hir::ExprKind::Match(call, [_, bind, ..], _), ..}) = stmt.kind &&
-                    let hir::ExprKind::Call(path, _args) = call.kind &&
-                    let hir::ExprKind::Path(hir::QPath::LangItem(LangItem::IteratorNext, _, _, )) = path.kind &&
-                    let hir::PatKind::Struct(path, [field, ..], _) = bind.pat.kind &&
-                    let hir::QPath::LangItem(LangItem::OptionSome, _, _) = path &&
-                    let PatField { pat: hir::Pat{ kind: hir::PatKind::Binding(_, _, ident, ..), .. }, ..} = field &&
-                    self.issue_span.source_equal(call.span) {
-                        self.loop_bind = Some(ident.name);
-                    }
-
-                if let hir::ExprKind::MethodCall(body_call, _recv, ..) = ex.kind &&
-                    body_call.ident.name == sym::next && ex.span.source_equal(self.expr_span) {
-                        self.body_expr = Some(ex);
-                }
-
-                hir::intravisit::walk_expr(self, ex);
-            }
-        }
-        let mut finder =
-            ExprFinder { expr_span: span, issue_span, loop_bind: None, body_expr: None };
-        finder.visit_expr(hir.body(body_id).value);
-
-        if let Some(loop_bind) = finder.loop_bind &&
-            let Some(body_expr) = finder.body_expr &&
-                let Some(def_id) = typeck_results.type_dependent_def_id(body_expr.hir_id) &&
-                let Some(trait_did) = tcx.trait_of_item(def_id) &&
-                tcx.is_diagnostic_item(sym::Iterator, trait_did) {
-                    err.note(format!(
-                        "a for loop advances the iterator for you, the result is stored in `{}`.",
-                        loop_bind
-                    ));
-                    err.help("if you want to call `next` on a iterator within the loop, consider using `while let`.");
-        }
-    }
-
     /// Suggest using closure argument instead of capture.
     ///
     /// For example:
 
@@ -936,11 +936,11 @@ unsafe fn embed_bitcode(
         llvm::LLVMSetInitializer(llglobal, llconst);
 
         let section = if is_apple {
-            "__LLVM,__bitcode\0"
+            c"__LLVM,__bitcode"
         } else if is_aix {
-            ".ipa\0"
+            c".ipa"
         } else {
-            ".llvmbc\0"
+            c".llvmbc"
         };
         llvm::LLVMSetSection(llglobal, section.as_ptr().cast());
         llvm::LLVMRustSetLinkage(llglobal, llvm::Linkage::PrivateLinkage);
@@ -954,11 +954,11 @@ unsafe fn embed_bitcode(
         );
         llvm::LLVMSetInitializer(llglobal, llconst);
         let section = if is_apple {
-            "__LLVM,__cmdline\0"
+            c"__LLVM,__cmdline"
         } else if is_aix {
-            ".info\0"
+            c".info"
         } else {
-            ".llvmcmd\0"
+            c".llvmcmd"
         };
         llvm::LLVMSetSection(llglobal, section.as_ptr().cast());
         llvm::LLVMRustSetLinkage(llglobal, llvm::Linkage::PrivateLinkage);
 
@@ -8,7 +8,6 @@ use crate::llvm_util;
 use crate::type_::Type;
 use crate::value::Value;
 
-use cstr::cstr;
 use rustc_codegen_ssa::base::{wants_msvc_seh, wants_wasm_eh};
 use rustc_codegen_ssa::traits::*;
 use rustc_data_structures::base_n;
 
@@ -303,6 +303,11 @@ pub(crate) fn create_object_file(sess: &Session) -> Option<write::Object<'static
             // the appropriate EF_AVR_ARCH flag.
             ef_avr_arch(&sess.target.options.cpu)
         }
+        Architecture::Avr => {
+            // Resolve the ISA revision and set
+            // the appropriate EF_AVR_ARCH flag.
+            ef_avr_arch(&sess.target.options.cpu)
+        }
         _ => 0,
     };
     // adapted from LLVM's `MCELFObjectTargetWriter::getOSABI`
 
@@ -87,12 +87,12 @@ pub(crate) fn eval_to_valtree<'tcx>(
 #[instrument(skip(tcx), level = "debug")]
 pub(crate) fn try_destructure_mir_constant_for_diagnostics<'tcx>(
     tcx: TyCtxt<'tcx>,
-    val: ConstValue<'tcx>,
-    ty: Ty<'tcx>,
-) -> Option<mir::DestructuredConstant<'tcx>> {
-    let param_env = ty::ParamEnv::reveal_all();
+    param_env: ty::ParamEnv<'tcx>,
+    val: mir::ConstantKind<'tcx>,
+) -> InterpResult<'tcx, mir::DestructuredConstant<'tcx>> {
+    trace!("destructure_mir_constant: {:?}", val);
     let ecx = mk_eval_cx(tcx, DUMMY_SP, param_env, CanAccessStatics::No);
-    let op = ecx.const_val_to_op(val, ty, None).ok()?;
+    let op = ecx.eval_mir_constant(&val, None, None)?;
 
     // We go to `usize` as we cannot allocate anything bigger anyway.
     let (field_count, variant, down) = match ty.kind() {
 
@@ -43,7 +43,7 @@ fn might_permit_raw_init_strict<'tcx>(
     ty: TyAndLayout<'tcx>,
     tcx: TyCtxt<'tcx>,
     kind: ValidityRequirement,
-) -> Result<bool, &'tcx LayoutError<'tcx>> {
+) -> Result<bool, LayoutError<'tcx>> {
     let machine = CompileTimeInterpreter::new(CanAccessStatics::No, CheckAlignment::Error);
 
     let mut cx = InterpCx::new(tcx, rustc_span::DUMMY_SP, ParamEnv::reveal_all(), machine);
 
@@ -283,7 +283,7 @@ fn run_compiler(
     interface::set_thread_safe_mode(&sopts.unstable_opts);
 
     if let Some(ref code) = matches.opt_str("explain") {
-        handle_explain(&early_error_handler, diagnostics_registry(), code, sopts.color);
+        handle_explain(&early_error_handler, diagnostics_registry(), code);
         return Ok(());
     }
 
@@ -541,7 +541,7 @@ impl Compilation {
     }
 }
 
-fn handle_explain(handler: &EarlyErrorHandler, registry: Registry, code: &str, color: ColorConfig) {
+fn handle_explain(handler: &EarlyErrorHandler, registry: Registry, code: &str) {
     let upper_cased_code = code.to_ascii_uppercase();
     let normalised =
         if upper_cased_code.starts_with('E') { upper_cased_code } else { format!("E{code:0>4}") };
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ fn run_compiler(`
`283`	`283`	`interface::set_thread_safe_mode(&sopts.unstable_opts);`
`284`	`284`
`285`	`285`	`if let Some(ref code) = matches.opt_str("explain") {`
`286`		`- handle_explain(&early_error_handler, diagnostics_registry(), code, sopts.color);`
	`286`	`+ handle_explain(&early_error_handler, diagnostics_registry(), code);`
`287`	`287`	`return Ok(());`
`288`	`288`	`}`
`289`	`289`
`@@ -541,7 +541,7 @@ impl Compilation {`
`541`	`541`	`}`
`542`	`542`	`}`
`543`	`543`
`544`		`-fn handle_explain(handler: &EarlyErrorHandler, registry: Registry, code: &str, color: ColorConfig) {`
	`544`	`+fn handle_explain(handler: &EarlyErrorHandler, registry: Registry, code: &str) {`
`545`	`545`	`let upper_cased_code = code.to_ascii_uppercase();`
`546`	`546`	`let normalised =`
`547`	`547`	`if upper_cased_code.starts_with('E') { upper_cased_code } else { format!("E{code:0>4}") };`