about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-07-22 02:58:19 +0000
committerbors <bors@rust-lang.org>2023-07-22 02:58:19 +0000
commita47f796a36593d352d79ee66d7f4c12d100f5241 (patch)
treee5a44e1a9f07e0861e043d5c3ab38333977cf9fc /src/tools
parentaad221e296715661a12715ab327dce058a807686 (diff)
parent179768c36af3c7c4cd83354b15f60e5d6f5b72a9 (diff)
Auto merge of #113938 - Mark-Simulacrum:beta-backport, r=Mark-Simulacrum
[beta] backport

This PR backports:

- #113690: allow opaques to be defined by trait queries, again
- #113631: make MCP510 behavior opt-in to avoid conflicts between the CLI and target flavors

It also includes a bump of bootstrap to the released stable.

r? `@Mark-Simulacrum`
Diffstat (limited to 'src/tools')
0 files changed, 0 insertions, 0 deletions