Matthias Krüger 73cc4eca56 Rollup merge of #126125 - dev-ardi:conflict-markers, r=estebank ... Improve conflict marker recovery <!-- If this PR is related to an unstable feature or an otherwise tracked effort, please link to the relevant tracking issue here. If you don't know of a related tracking issue or there are none, feel free to ignore this. This PR will get automatically assigned to a reviewer. In case you would like a specific user to review your work, you can assign it to them by using r​? <reviewer name> --> closes #113826 r? ```@estebank``` since you reviewed #115413 cc: ```@rben01``` since you opened up the issue in the first place		2024-06-21 09:12:34 +02:00
..
rustc	Change SIGPIPE ui from #[unix_sigpipe = "..."] to -Zon-broken-pipe=...	2024-05-02 19:48:29 +02:00
rustc_abi	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_arena	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_ast	Introduce can_begin_string_literal.	2024-06-20 04:50:40 +10:00
rustc_ast_ir	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_ast_lowering	Rollup merge of #125293 - dingxiangfei2009:tail-expr-temp-lifetime, r=estebank,davidtwco	2024-06-19 01:51:38 +01:00
rustc_ast_passes	Properly gate safe keyword in pre-expansion	2024-06-20 14:14:49 -04:00
rustc_ast_pretty	Rollup merge of #124135 - petrochenkov:deleglob, r=fmease	2024-06-19 01:51:36 +01:00
rustc_attr	Use a dedicated type instead of a reference for the diagnostic context	2024-06-18 15:42:11 +00:00
rustc_baked_icu_data	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_borrowck	Remove redundant argument from subdiagnostic method	2024-06-18 15:42:11 +00:00
rustc_builtin_macros	Convert some module-level // and /// comments to //!.	2024-06-20 09:23:18 +10:00
rustc_codegen_cranelift	bug! more uses of these in runtime stuff	2024-06-19 10:44:01 -07:00
rustc_codegen_gcc	Add blank lines after module-level //! comments.	2024-06-20 09:23:20 +10:00
rustc_codegen_llvm	Remove redundant argument from subdiagnostic method	2024-06-18 15:42:11 +00:00
rustc_codegen_ssa	Rollup merge of #126717 - nnethercote:rustfmt-use-pre-cleanups, r=jieyouxu	2024-06-20 14:07:04 +02:00
rustc_const_eval	bug! more uses of these in runtime stuff	2024-06-19 10:44:01 -07:00
rustc_data_structures	Convert some module-level // and /// comments to //!.	2024-06-20 09:23:18 +10:00
rustc_driver	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_driver_impl	Use a dedicated type instead of a reference for the diagnostic context	2024-06-18 15:42:11 +00:00
rustc_error_codes	Auto merge of #126319 - workingjubilee:rollup-lendnud, r=workingjubilee	2024-06-12 11:10:50 +00:00
rustc_error_messages	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_errors	Rollup merge of #126719 - nnethercote:fix-126521, r=oli-obk	2024-06-20 14:07:04 +02:00
rustc_expand	Add blank lines after module-level //! comments.	2024-06-20 09:23:20 +10:00
rustc_feature	Auto merge of #116088 - nbdd0121:unwind, r=Amanieu,RalfJung	2024-06-20 11:22:59 +00:00
rustc_fluent_macro	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_fs_util	Remove useless tidy-alphabetical markers.	2024-06-20 09:23:20 +10:00
rustc_graphviz	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_hir	local_def_path_hash_to_def_id can fail	2024-06-19 07:45:47 -04:00
rustc_hir_analysis	Rollup merge of #126717 - nnethercote:rustfmt-use-pre-cleanups, r=jieyouxu	2024-06-20 14:07:04 +02:00
rustc_hir_pretty	Rework precise capturing syntax	2024-06-17 22:35:25 -04:00
rustc_hir_typeck	Rollup merge of #126717 - nnethercote:rustfmt-use-pre-cleanups, r=jieyouxu	2024-06-20 14:07:04 +02:00
rustc_incremental	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_index	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_index_macros	rustc_span: Minor improvements	2024-06-16 14:08:25 +03:00
rustc_infer	Add blank lines after module-level //! comments.	2024-06-20 09:23:20 +10:00
rustc_interface	Auto merge of #126623 - oli-obk:do_not_count_errors, r=davidtwco	2024-06-18 16:49:19 +00:00
rustc_lexer	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_lint	Clarify that anonymous consts still do introduce a new scope	2024-06-19 18:34:15 -07:00
rustc_lint_defs	Remove useless tidy-alphabetical markers.	2024-06-20 09:23:20 +10:00
rustc_llvm	Auto merge of #125141 - SergioGasquez:feat/no_std-xtensa, r=davidtwco	2024-06-12 13:43:31 +00:00
rustc_log	Bump tracing-tree and allow rendering lines again	2024-06-12 10:11:41 +00:00
rustc_macros	Remove redundant argument from subdiagnostic method	2024-06-18 15:42:11 +00:00
rustc_metadata	Use a dedicated type instead of a reference for the diagnostic context	2024-06-18 15:42:11 +00:00
rustc_middle	Auto merge of #126736 - matthiaskrgr:rollup-rb20oe3, r=matthiaskrgr	2024-06-20 13:36:42 +00:00
rustc_mir_build	Auto merge of #126679 - fmease:rollup-njrv2py, r=fmease	2024-06-19 11:09:31 +00:00
rustc_mir_dataflow	Use is_lang_item more aggressively	2024-06-14 16:54:29 -04:00
rustc_mir_transform	Auto merge of #126578 - scottmcm:inlining-bonuses-too, r=davidtwco	2024-06-21 02:06:27 +00:00
rustc_monomorphize	Use a dedicated type instead of a reference for the diagnostic context	2024-06-18 15:42:11 +00:00
rustc_next_trait_solver	Make rustc_next_trait_solver nightly again	2024-06-18 18:52:48 -04:00
rustc_parse	Rollup merge of #126125 - dev-ardi:conflict-markers, r=estebank	2024-06-21 09:12:34 +02:00
rustc_parse_format	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_passes	Rollup merge of #124580 - gurry:124556-suggest-remove-tuple-field, r=jackh726	2024-06-19 09:51:59 +02:00
rustc_pattern_analysis	Add blank lines after module-level //! comments.	2024-06-20 09:23:20 +10:00
rustc_privacy	Do not ICE in privacy when type inference fails.	2024-06-17 10:09:27 +00:00
rustc_query_impl	Allow tracing through item_bounds query invocations on opaques	2024-06-19 08:47:55 +00:00
rustc_query_system	Allow for try_force_from_dep_node to fail	2024-06-19 07:21:41 -04:00
rustc_resolve	collect attrs in const block expr	2024-06-20 19:59:27 +08:00
rustc_sanitizers	Add blank lines after module-level //! comments.	2024-06-20 09:23:20 +10:00
rustc_serialize	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_session	Add blank lines after module-level //! comments.	2024-06-20 09:23:20 +10:00
rustc_smir	Add blank lines after module-level //! comments.	2024-06-20 09:23:20 +10:00
rustc_span	rustc_span: Optimize span parent get/set methods	2024-06-20 17:02:13 +03:00
rustc_symbol_mangling	Use a dedicated type instead of a reference for the diagnostic context	2024-06-18 15:42:11 +00:00
rustc_target	Rollup merge of #126717 - nnethercote:rustfmt-use-pre-cleanups, r=jieyouxu	2024-06-20 14:07:04 +02:00
rustc_trait_selection	Rollup merge of #126717 - nnethercote:rustfmt-use-pre-cleanups, r=jieyouxu	2024-06-20 14:07:04 +02:00
rustc_traits	Use tidy to sort crate attributes for all compiler crates.	2024-06-12 15:49:10 +10:00
rustc_transmute	safe transmute: support non-ZST, variantful, uninhabited enums	2024-06-14 21:11:08 +00:00
rustc_ty_utils	Rename InstanceDef -> InstanceKind	2024-06-16 21:35:21 -04:00
rustc_type_ir	Rollup merge of #126649 - compiler-errors:nightly, r=lcnr	2024-06-20 07:52:44 +02:00
rustc_type_ir_macros	Uplift TraitPredicate	2024-05-11 18:20:00 -04:00
stable_mir	Add blank lines after module-level //! comments.	2024-06-20 09:23:20 +10:00