diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2023-07-16 06:33:33 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2023-07-16 06:33:33 +0000 |
| commit | 2e4a1903875f848466844a4d683cabcbceecaeee (patch) | |
| tree | 23b5d0c5333cffd4b5f67f1bb7a98d5f66e05897 /compiler/rustc_span/src | |
| parent | 648d74a068be79fa6c1349a4740962527af8d448 (diff) | |
| parent | e87c15c8e4dbe98d72bd1b18b9f5c70cacd44672 (diff) | |
| download | rust-2e4a1903875f848466844a4d683cabcbceecaeee.tar.gz rust-2e4a1903875f848466844a4d683cabcbceecaeee.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/lib.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs index 3bb9c4920c4..5c56337d1e0 100644 --- a/compiler/rustc_span/src/lib.rs +++ b/compiler/rustc_span/src/lib.rs @@ -2159,7 +2159,8 @@ where // If this is not an empty or invalid span, we want to hash the last // position that belongs to it, as opposed to hashing the first // position past it. - let Some((file, line_lo, col_lo, line_hi, col_hi)) = ctx.span_data_to_lines_and_cols(&span) else { + let Some((file, line_lo, col_lo, line_hi, col_hi)) = ctx.span_data_to_lines_and_cols(&span) + else { Hash::hash(&TAG_INVALID_SPAN, hasher); return; }; diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index d655276a991..4fc440ef947 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -1280,7 +1280,7 @@ symbols! { rustc_dummy, rustc_dump_env_program_clauses, rustc_dump_program_clauses, - rustc_dump_user_substs, + rustc_dump_user_args, rustc_dump_vtable, rustc_effective_visibility, rustc_error, |