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 7 pull requests #91945

Merged
merged 32 commits into from
Dec 15, 2021
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3f2a1c9
Use `OutputFilenames` to generate output file for `-Zllvm-time-trace`
tmiasko Dec 13, 2021
7f2f9c6
Iterator::cycle() — document empty iterator special case
xkr47 Dec 13, 2021
715c562
[ReviewFix] Linguistics
xkr47 Dec 13, 2021
7227a87
When `.await` is called on a non-`Future` expression, suggest removal
estebank Nov 16, 2021
75b6275
Reduce verbosity when calling `for`-loop on non-`Iterator` expression
estebank Nov 16, 2021
caf0c1b
Reduce verbosity for `?` on non-`Try` expressions
estebank Nov 16, 2021
81a3b90
Further silence `?` errors
estebank Nov 16, 2021
79749d6
Remove yet more output from `for`-loop and `?` errors
estebank Nov 16, 2021
4f2b1c0
Remove unnecessary argument
estebank Nov 16, 2021
d45e030
Fix mistake
estebank Nov 16, 2021
f640438
Keep info on pre-desugaring expression for better "incorrect `.await`…
estebank Nov 16, 2021
8888d0d
Fix clippy uses of QPath::LangItem
estebank Nov 16, 2021
b825b0f
Fix rebase and clippy tests
estebank Nov 16, 2021
9ecb141
tidy fix
estebank Nov 16, 2021
d59f74a
Simplify diagnostic logic
estebank Nov 17, 2021
64dea33
review comments
estebank Dec 2, 2021
1a7f2d5
review comment: change wording of suggestion
estebank Dec 10, 2021
64f88e8
fix clippy tests
estebank Dec 10, 2021
f2fc84f
fix coverage report test
estebank Dec 13, 2021
3011154
Revert "Set MACOSX_DEPLOYMENT_TARGET env var to default for linking i…
hkratz Dec 13, 2021
ae21dd0
Remove in_band_lifetimes
Patrick-Poitras Dec 14, 2021
a586e7d
Make suggestions from @jackh726; run fmt
Patrick-Poitras Dec 14, 2021
304ede6
Stabilize iter::zip.
Patrick-Poitras Dec 13, 2021
047adb5
Remove iter::zip feature gate from clippy
Patrick-Poitras Dec 14, 2021
d9dd360
Update cargo
ehuss Dec 14, 2021
272188e
Rollup merge of #90939 - estebank:wg-af-polish, r=tmandry
matthiaskrgr Dec 15, 2021
d6c802e
Rollup merge of #91859 - xkr47:patch-2, r=yaahc
matthiaskrgr Dec 15, 2021
ccfc22b
Rollup merge of #91868 - tmiasko:llvm-time-trace-out, r=oli-obk
matthiaskrgr Dec 15, 2021
2f270e4
Rollup merge of #91870 - rusticstuff:macosx_min_version_revert, r=Mar…
matthiaskrgr Dec 15, 2021
4e7497b
Rollup merge of #91881 - Patrick-Poitras:stabilize-iter-zip, r=scottmcm
matthiaskrgr Dec 15, 2021
6abad4c
Rollup merge of #91882 - Patrick-Poitras:remove-in-band-lifetimes-fro…
matthiaskrgr Dec 15, 2021
22fc403
Rollup merge of #91940 - ehuss:update-cargo, r=ehuss
matthiaskrgr Dec 15, 2021
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 mistake
  • Loading branch information
estebank committed Dec 13, 2021
commit d45e030c04c19ce9c14787a793fd2e32674814d7
1 change: 1 addition & 0 deletions compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs
Original file line number Diff line number Diff line change
@@ -816,6 +816,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
hir::LangItem::TryTraitFromOutput
| hir::LangItem::TryTraitFromResidual
| hir::LangItem::TryTraitBranch => ObligationCauseCode::QuestionMark,
_ => traits::ItemObligation(def_id),
},
);
(Res::Def(def_kind, def_id), ty)