Skip to content
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.

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

Rollup of 8 pull requests #102948

Merged
merged 51 commits into from
Oct 12, 2022
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
72b3347
use correct location for type tests in promoted consts
b-naber Sep 23, 2022
29cc36f
add test
b-naber Sep 23, 2022
39484ac
Move style guide to rust-lang/rust
joshtriplett Sep 24, 2022
9a9e827
triagebot.toml: Add autolabel for T-style
joshtriplett Sep 24, 2022
283c0e4
style-guide: Remove trailing space
joshtriplett Sep 24, 2022
9a72a66
style-guide: Fix broken links
joshtriplett Sep 24, 2022
69cafc0
always panic for invalid integer logarithm
Oct 2, 2022
6acc29f
add tests for panicking integer logarithms
Oct 2, 2022
b7dae8a
remove unneeded attributes
Oct 2, 2022
bde80f7
Add lint for diagnostic migration
rdvdev2 Aug 22, 2022
2f74d1d
Migrate weak_lang_items.rs
rdvdev2 Aug 22, 2022
17a4a68
Migrate derivable diagnostics in lang_items.rs
rdvdev2 Sep 1, 2022
0315d7c
Migrate derivable diagnostics in check_attr.rs
rdvdev2 Sep 2, 2022
2c3351c
Migrate InvalidAttrAtCrateLevel
rdvdev2 Sep 2, 2022
c24a873
always put ftl message on next line, resolve all but 1 output compari…
CleanCut Sep 21, 2022
b8e03cf
use consistent names
CleanCut Sep 22, 2022
1222541
resolve merge conflict from cherry-picking 6a47326a0452cc8d5cb5767650…
diegooliveira Sep 14, 2022
c103c30
migrate the rest of weak_lang_items.rs to translateable diagnostics
CleanCut Sep 22, 2022
1e86226
migrate debugger_visualizer.rs to translateable diagnostics
CleanCut Sep 22, 2022
f8ebc72
errors: add `emit_note`/`create_note`
davidtwco Sep 1, 2022
3a74833
use cherry-picked commit from #100754 to emit note without error
CleanCut Sep 22, 2022
0609c0f
migrate diagnostic_items.rs to translateable diagnostics
CleanCut Sep 23, 2022
40d5f00
migrate layout_test.rs to translateable diagnostics
CleanCut Sep 23, 2022
c457abe
migrate lib_features.rs to translateable diagnostics
CleanCut Sep 24, 2022
572f341
migrate check_const.rs to translateable diagnostics
CleanCut Sep 24, 2022
69766e4
migrate loops.rs to translateable diagnostics
CleanCut Sep 26, 2022
96f92ea
migrate naked_functions.rs to translateable diagnostics
CleanCut Sep 27, 2022
b17ec43
migrate entry.rs to translateable diagnostics
CleanCut Sep 28, 2022
f0afb88
migrate lang_items.rs to translateable diagnostics
CleanCut Oct 1, 2022
a7aa185
migrate dead.rs to translateable diagnostics
CleanCut Oct 2, 2022
3fe8e00
migrate the rest of check_attr.rs to translateable diagnostics
CleanCut Oct 2, 2022
be4059d
migrate stability.rs to translateable diagnostics
CleanCut Oct 3, 2022
965dbf6
First batch of review feedback changes from #102110
CleanCut Oct 3, 2022
8e07a85
Remove code that was removed in master, and the corresponding diagnostic
CleanCut Oct 5, 2022
57eba4f
avoid string dispatch in fluent
CleanCut Oct 5, 2022
31c269a
avoid string dispatch in fluent
CleanCut Oct 7, 2022
b9e4a1c
use memset to initialize a readbuf
the8472 Oct 8, 2022
50e2795
remove out-of-date fixme
CleanCut Oct 10, 2022
5ef1c03
make up your mind, rustfmt
CleanCut Oct 10, 2022
d933092
Check representability in adt_sized_constraint
camsteffen Oct 10, 2022
b5963f0
rustdoc: remove unused classes from sidebar
notriddle Oct 11, 2022
062284a
rustdoc: remove unneeded `.content` selector from link colors
notriddle Oct 11, 2022
a7f58af
unify `IsPattern` and `IsImport` enum
SparrowLii Oct 12, 2022
32471a7
Rollup merge of #102110 - CleanCut:migrate_rustc_passes_diagnostics, …
Dylan-DPC Oct 12, 2022
5e04567
Rollup merge of #102187 - b-naber:inline-const-source-info, r=eholk
Dylan-DPC Oct 12, 2022
f8723f9
Rollup merge of #102239 - joshtriplett:style-guide, r=calebcartwright
Dylan-DPC Oct 12, 2022
d8091f8
Rollup merge of #102578 - lukas-code:ilog-panic, r=m-ou-se
Dylan-DPC Oct 12, 2022
658169b
Rollup merge of #102811 - the8472:bufread-memset, r=m-ou-se
Dylan-DPC Oct 12, 2022
c8a8e7d
Rollup merge of #102890 - camsteffen:adt-sized-representability, r=cj…
Dylan-DPC Oct 12, 2022
252ce10
Rollup merge of #102913 - SparrowLii:import-candidate, r=compiler-errors
Dylan-DPC Oct 12, 2022
96bcced
Rollup merge of #102924 - notriddle:notriddle/sidebar-link-class, r=G…
Dylan-DPC Oct 12, 2022
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
use consistent names
CleanCut committed Oct 7, 2022
commit b8e03cfa55d6133f8fc1fd3a82a7e686a9cf006e
4 changes: 2 additions & 2 deletions compiler/rustc_passes/src/check_attr.rs
Original file line number Diff line number Diff line change
@@ -1862,11 +1862,11 @@ impl CheckAttrVisitor<'_> {

match std::fs::File::open(&file) {
Ok(_) => true,
Err(err) => {
Err(error) => {
self.tcx.sess.emit_err(DebugVisualizerUnreadable {
span: meta_item.span,
file: &file,
error: err,
error,
});
false
}
8 changes: 4 additions & 4 deletions compiler/rustc_passes/src/lang_items.rs
Original file line number Diff line number Diff line change
@@ -35,8 +35,8 @@ impl<'tcx> LanguageItemCollector<'tcx> {

fn check_for_lang(&mut self, actual_target: Target, hir_id: HirId) {
let attrs = self.tcx.hir().attrs(hir_id);
if let Some((value, span)) = extract(&attrs) {
match ITEM_REFS.get(&value).cloned() {
if let Some((name, span)) = extract(&attrs) {
match ITEM_REFS.get(&name).cloned() {
// Known lang item with attribute on correct target.
Some((item_index, expected_target)) if actual_target == expected_target => {
self.collect_item_extended(item_index, hir_id, span);
@@ -45,14 +45,14 @@ impl<'tcx> LanguageItemCollector<'tcx> {
Some((_, expected_target)) => {
self.tcx.sess.emit_err(LangItemOnIncorrectTarget {
span,
name: value,
name,
expected_target,
actual_target,
});
}
// Unknown lang item.
_ => {
self.tcx.sess.emit_err(UnknownLangItem { span, name: value });
self.tcx.sess.emit_err(UnknownLangItem { span, name });
}
}
}