Skip to content

Rollup of 8 pull requests #107327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 23 commits into from
Closed

Rollup of 8 pull requests #107327

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2b99b9f
Preserve split DWARF files when building archives.
khuey Jan 15, 2023
1a6ab6c
Empty regions don't exist anymore, remove them from fluent
oli-obk Jan 17, 2023
64e5f91
Handle diagnostics customization on the fluent side
oli-obk Jan 17, 2023
6fe4cf7
Migrate mir_build's borrow conflicts
mejrs Jan 17, 2023
afd5307
Move `ty::tls` to seperate file
Noratrieb Dec 31, 2022
0d11b77
Some ty::tls cleanups
Noratrieb Dec 31, 2022
db305d0
Use strict provenance APIs in ty::tls
Noratrieb Dec 31, 2022
f74ca88
Use a type-alias-impl-trait in `ObligationForest`
Noratrieb Jan 21, 2023
d7f6564
Encode AdtDef in the def-id loop.
cjgillot Jul 3, 2022
6ecf30d
Inline encode_enum_variant_info.
cjgillot Jul 3, 2022
4d11206
Tweak comments.
cjgillot Jan 22, 2023
114eb2d
Replace ZST operands and debuginfo by constants.
cjgillot Jan 23, 2023
2a3b0e3
Rename method.
cjgillot Jan 25, 2023
49f4399
Generalize operation.
cjgillot Jan 25, 2023
d7f59e9
Custom mir: Add support for some remaining, easy to support constructs
JakobDegen Jan 26, 2023
e328198
Rollup merge of #106904 - khuey:preserve_debuginfo_for_rlibs, r=david…
matthiaskrgr Jan 26, 2023
dee71b6
Rollup merge of #106971 - oli-obk:tait_error, r=davidtwco
matthiaskrgr Jan 26, 2023
b3cdfc5
Rollup merge of #106978 - mejrs:mir_build3, r=davidtwco
matthiaskrgr Jan 26, 2023
6ec4b73
Rollup merge of #107150 - Nilstrieb:thread-local-cleanups, r=cjgillot
matthiaskrgr Jan 26, 2023
2f2356a
Rollup merge of #107168 - Nilstrieb:if-a-tait-falls-in-the-forest,can…
matthiaskrgr Jan 26, 2023
ca7a610
Rollup merge of #107189 - cjgillot:meta-adt, r=compiler-errors
matthiaskrgr Jan 26, 2023
71fa6ef
Rollup merge of #107270 - cjgillot:remove-zst, r=oli-obk
matthiaskrgr Jan 26, 2023
a3da8b6
Rollup merge of #107322 - JakobDegen:custom-mir, r=tmiasko
matthiaskrgr Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Empty regions don't exist anymore, remove them from fluent
  • Loading branch information
@oli-obk
oli-obk committed Jan 17, 2023
commit 1a6ab6c16a4902aef1e6d49ca188e1e112c677b7
2 changes: 0 additions & 2 deletions compiler/rustc_error_messages/locales/en-US/infer.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@ infer_region_explanation = {$pref_kind ->
}{$desc_kind ->
*[should_not_happen] [{$desc_kind}]
[restatic] the static lifetime
[reempty] the empty lifetime
[reemptyuni] the empty lifetime in universe {$desc_arg}
[revar] lifetime {$desc_arg}

[as_defined] the lifetime `{$desc_arg}` as defined here
Expand Down