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 10 pull requests #111760

Closed
wants to merge 21 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
926e874
Dont check `must_use` on nested `impl Future` from fn
compiler-errors May 12, 2023
d371b80
Bump `cc` for `bootstrap`
r-value May 18, 2023
f0f9d88
Add Iterator::map_windows
frank-king May 10, 2023
e6a7fde
Give a more useful location for where a span_bug was delayed
jyn514 May 18, 2023
f577cc4
Fix doc comment for `ConstParamTy` derive
juntyr May 18, 2023
30c0e4e
Add more tests for the offset_of!() macro
est31 May 17, 2023
3e4ed61
do not overwrite obligations
lcnr May 18, 2023
0426562
very minor cleanups
jyn514 May 15, 2023
ad5955b
Migrate GUI colors test to original CSS color format
GuillaumeGomez May 18, 2023
1551495
Fix an ICE in CGU dumping code.
nnethercote May 18, 2023
1bb957e
Improve CGU partitioning debug output.
nnethercote May 18, 2023
4c03da9
Rollup merge of #94667 - frank-king:feature/iter_map_windows, r=Mark-…
GuillaumeGomez May 19, 2023
477cc24
Rollup merge of #111491 - compiler-errors:nested-fut-must-use, r=wesl…
GuillaumeGomez May 19, 2023
f410a76
Rollup merge of #111606 - jyn514:nightly-diagnostics, r=lcnr
GuillaumeGomez May 19, 2023
3d86765
Rollup merge of #111665 - est31:offset_of_tests, r=WaffleLapkin
GuillaumeGomez May 19, 2023
c00e88a
Rollup merge of #111701 - r-value:patch-1, r=jyn514
GuillaumeGomez May 19, 2023
98989f3
Rollup merge of #111708 - jyn514:delay-span-bug-msg, r=compiler-errors
GuillaumeGomez May 19, 2023
af26f19
Rollup merge of #111715 - juntyr:const-param-ty-derive-fix, r=Nilstrieb
GuillaumeGomez May 19, 2023
3b393c1
Rollup merge of #111723 - lcnr:overwrite-obligations, r=compiler-errors
GuillaumeGomez May 19, 2023
1123c72
Rollup merge of #111726 - GuillaumeGomez:gui-test-migrate-color, r=no…
GuillaumeGomez May 19, 2023
807f36a
Rollup merge of #111743 - nnethercote:improve-cgu-merging-debug-outpu…
GuillaumeGomez May 19, 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
Fix an ICE in CGU dumping code.
nnethercote committed May 18, 2023
commit 1551495d3221b6162b96a14fc5cdb45f2783ed3c
4 changes: 2 additions & 2 deletions compiler/rustc_monomorphize/src/partitioning/mod.rs
Original file line number Diff line number Diff line change
@@ -365,14 +365,14 @@ where
let symbol_hash_start = symbol_name.rfind('h');
let symbol_hash = symbol_hash_start.map_or("<no hash>", |i| &symbol_name[i..]);

let _ = writeln!(
let _ = with_no_trimmed_paths!(writeln!(
s,
" - {} [{:?}] [{}] estimated size {}",
mono_item,
linkage,
symbol_hash,
mono_item.size_estimate(tcx)
);
));
}

let _ = writeln!(s);