Skip to content

Rollup of 7 pull requests #108127

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

Merged
merged 24 commits into from
Feb 16, 2023
Merged

Rollup of 7 pull requests #108127

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5f93edd
Prevent some attributes from being merged with others on reexports
GuillaumeGomez Feb 14, 2023
f02d8ec
More accurate spans for arg removal suggestion
estebank Jan 1, 2023
fb61f5d
Fix fmt
estebank Jan 1, 2023
287cd59
Avoid trailing commas
estebank Jan 1, 2023
5d63e10
rebase and review comments
estebank Feb 1, 2023
bd176ee
Make removal suggestion not verbose
estebank Feb 1, 2023
755252b
Show the effects of weird code commented out
estebank Feb 2, 2023
dff10d0
Re-add replacement logic and add comment explaining it
estebank Feb 2, 2023
02a845a
Correctly handle reexport traversal by fixing multiple bugs, especial…
GuillaumeGomez Feb 14, 2023
1ec1d94
Add test for reexports attr merge
GuillaumeGomez Feb 14, 2023
374f798
Correctly handle reexports of `#[doc(hidden)]` is reexport does not u…
GuillaumeGomez Feb 14, 2023
0400c68
use chars instead of strings where applicable
matthiaskrgr Feb 15, 2023
b488508
note issue for feature(packed_bundled_libs)
belovdv Feb 15, 2023
540bd98
Do not ICE on unmet trait alias bounds
eggyal Feb 16, 2023
8751fa1
`if $c:expr { Some($r:expr) } else { None }` =>> `$c.then(|| $r)`
WaffleLapkin Feb 15, 2023
5bf6a46
Replace some `then`s with some `then_some`s
WaffleLapkin Feb 15, 2023
3230577
Add new people to the compiletest review rotation
albertlarsan68 Feb 16, 2023
f65c6e4
Rollup merge of #106347 - estebank:removal-suggestion, r=TaKO8Ki
matthiaskrgr Feb 16, 2023
0412898
Rollup merge of #108057 - GuillaumeGomez:fix-reexport-attr-merge, r=n…
matthiaskrgr Feb 16, 2023
64a4f70
Rollup merge of #108090 - WaffleLapkin:if_not_now_then_when…, r=oli-obk
matthiaskrgr Feb 16, 2023
2dc21c0
Rollup merge of #108092 - BelovDV:fix-feature-description-pbl, r=petr…
matthiaskrgr Feb 16, 2023
09a2267
Rollup merge of #108099 - matthiaskrgr:str_to_char, r=GuillaumeGomez
matthiaskrgr Feb 16, 2023
d77b022
Rollup merge of #108115 - eggyal:unmet_trait_alias_bound, r=compiler-…
matthiaskrgr Feb 16, 2023
eb9f9c7
Rollup merge of #108125 - albertlarsan68:moar-compiletest-reviewers, …
matthiaskrgr Feb 16, 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 fmt
  • Loading branch information
@estebank
estebank committed Feb 14, 2023
commit fb61f5d781334280ecb1d54aaad04584afac21ec
7 changes: 2 additions & 5 deletions compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,11 +761,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
Compatibility::Incompatible(Some(e)),
) = error else { return false };
let (provided_ty, provided_span) = provided_arg_tys[*provided_idx];
let trace = mk_trace(
provided_span,
formal_and_expected_inputs[*expected_idx],
provided_ty,
);
let trace =
mk_trace(provided_span, formal_and_expected_inputs[*expected_idx], provided_ty);
if !matches!(trace.cause.as_failure_code(*e), FailureCode::Error0308(_)) {
self.err_ctxt().report_and_explain_type_error(trace, *e).emit();
return true;
Expand Down