Skip to content

Commit 31d6097

Browse files
committed
Auto merge of rust-lang#120980 - matthiaskrgr:rollup-dsjsqql, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - rust-lang#120765 (Reorder diagnostics API) - rust-lang#120833 (More internal emit diagnostics cleanups) - rust-lang#120899 (Gracefully handle non-WF alias in `assemble_alias_bound_candidates_recur`) - rust-lang#120917 (Remove a bunch of dead parameters in functions) - rust-lang#120928 (Add test for recently fixed issue) - rust-lang#120933 (check_consts: fix duplicate errors, make importance consistent) - rust-lang#120936 (improve `btree_cursors` functions documentation) - rust-lang#120944 (Check that the ABI of the instance we are inlining is correct) - rust-lang#120956 (Clean inlined type alias with correct param-env) - rust-lang#120962 (Add myself to library/std review) - rust-lang#120972 (fix ICE for deref coercions with type errors) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 05101ff + 6fda300 commit 31d6097

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/integration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn integration_test() {
7777
// the repo basically just contains a span_delayed_bug that forces rustc/clippy to panic:
7878
/*
7979
#![feature(rustc_attrs)]
80-
#[rustc_error(span_delayed_bug_from_inside_query)]
80+
#[rustc_error(delayed_bug_from_inside_query)]
8181
fn main() {}
8282
*/
8383

0 commit comments

Comments
 (0)