Skip to content

Commit cef633d

Browse files
committedJan 22, 2023
Auto merge of #107187 - matthiaskrgr:rollup-lvwzlg2, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #107102 (Implement some more predicates in the new solver) - #107111 (Fix missing arguments issues and copy-paste bug for fluent) - #107114 (Add note about absolute paths to Path::join) - #107127 (Enable sanitizers for s390x-linux) - #107152 (Migrate scraped-examples top and bottom "borders" to CSS variables) - #107170 (Add myself to .mailmap) - #107174 (rustdoc: Use `DefId(Map,Set)` instead of `FxHash(Map,Set)`) - #107180 (Remove unnecessary `&format!`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
·
1.89.01.69.0
2 parents 8e68090 + 2f7a3a1 commit cef633d

File tree

41 files changed

+484
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+484
-164
lines changed
 

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Adrien Tétar <adri-from-59@hotmail.fr>
1515
Ahmed Charles <ahmedcharles@gmail.com> <acharles@outlook.com>
1616
Alan Egerton <eggyal@gmail.com>
1717
Alan Stoate <alan.stoate@gmail.com>
18+
Albert Larsan <albert.larsan@gmail.com> Albert Larsan <74931857+albertlarsan68@users.noreply.github.com>
1819
Alessandro Decina <alessandro.d@gmail.com>
1920
Alex Burka <durka42+github@gmail.com> Alex Burka <aburka@seas.upenn.edu>
2021
Alex Hansen <ahansen2@trinity.edu>

‎compiler/rustc_error_messages/locales/en-US/infer.ftl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -268,28 +268,28 @@ infer_but_calling_introduces = {$has_param_name ->
268268
[true] `{$param_name}`
269269
*[false] `fn` parameter
270270
} has {$lifetime_kind ->
271-
[named] lifetime `{$lifetime}`
272-
*[anon] an anonymous lifetime `'_`
273-
} but calling `{assoc_item}` introduces an implicit `'static` lifetime requirement
271+
[true] lifetime `{$lifetime}`
272+
*[false] an anonymous lifetime `'_`
273+
} but calling `{$assoc_item}` introduces an implicit `'static` lifetime requirement
274274
.label1 = {$has_lifetime ->
275-
[named] lifetime `{$lifetime}`
276-
*[anon] an anonymous lifetime `'_`
275+
[true] lifetime `{$lifetime}`
276+
*[false] an anonymous lifetime `'_`
277277
}
278278
.label2 = ...is used and required to live as long as `'static` here because of an implicit lifetime bound on the {$has_impl_path ->
279-
[named] `impl` of `{$impl_path}`
280-
*[anon] inherent `impl`
279+
[true] `impl` of `{$impl_path}`
280+
*[false] inherent `impl`
281281
}
282282
283283
infer_but_needs_to_satisfy = {$has_param_name ->
284284
[true] `{$param_name}`
285285
*[false] `fn` parameter
286286
} has {$has_lifetime ->
287-
[named] lifetime `{$lifetime}`
288-
*[anon] an anonymous lifetime `'_`
287+
[true] lifetime `{$lifetime}`
288+
*[false] an anonymous lifetime `'_`
289289
} but it needs to satisfy a `'static` lifetime requirement
290290
.influencer = this data with {$has_lifetime ->
291-
[named] lifetime `{$lifetime}`
292-
*[anon] an anonymous lifetime `'_`
291+
[true] lifetime `{$lifetime}`
292+
*[false] an anonymous lifetime `'_`
293293
}...
294294
.require = {$spans_empty ->
295295
*[true] ...is used and required to live as long as `'static` here
@@ -302,8 +302,8 @@ infer_more_targeted = {$has_param_name ->
302302
[true] `{$param_name}`
303303
*[false] `fn` parameter
304304
} has {$has_lifetime ->
305-
[named] lifetime `{$lifetime}`
306-
*[anon] an anonymous lifetime `'_`
305+
[true] lifetime `{$lifetime}`
306+
*[false] an anonymous lifetime `'_`
307307
} but calling `{$ident}` introduces an implicit `'static` lifetime requirement
308308
309309
infer_ril_introduced_here = `'static` requirement introduced here

0 commit comments

Comments
 (0)
Please sign in to comment.