Code

Rollup of 8 pull requests#126781

Code

Merged

bors merged 19 commits intorust-lang:masterrust-lang/rust:masterfrom

matthiaskrgr:rollup-5u4pensmatthiaskrgr/rust:rollup-5u4pensCopy head branch name to clipboard

Jun 21, 2024

Commits

Commits on Jun 14, 2024

• Add powerpc-unknown-openbsd maintaince status

  ChrisDenton

  committed
  9b22110

  Copy full SHA for 9b22110

Commits on Jun 18, 2024

• Print the tested value in int_log tests

  tgross35

  committed
  c4ddc86

  Copy full SHA for c4ddc86

• Improve conflict marker recovery

  oriongonza

  committed
  d51b446

  Copy full SHA for d51b446

• make this comment correct

  oriongonza

  committed
  9f63712

  Copy full SHA for 9f63712

Commits on Jun 19, 2024

• Add the target-features

  sayantn

  committed
  b6d20d1

  Copy full SHA for b6d20d1

• Fix stderr cases

  sayantn

  committed
  1e1b3fc

  Copy full SHA for 1e1b3fc

• Add a test demonstrating the problem

  compiler-errors

  committed
  50d1efa

  Copy full SHA for 50d1efa

• Allow naming expr_2021 in all editions

  compiler-errors

  committed
  3e8898a

  Copy full SHA for 3e8898a

Commits on Jun 20, 2024

• Specify target for inaccessible-temp-dir rmake test

  Hoverbear

  committed
  a656bb6

  Copy full SHA for a656bb6

• StaticForeignItem and StaticItem are the same

  compiler-errors

  committed
  3e59f0c

  Copy full SHA for 3e59f0c

Commits on Jun 21, 2024

• Fix another assertion failure for some Expect diagnostics.

  Show description for d6efcbb
  nnethercote

  committed
  d6efcbb

  Copy full SHA for d6efcbb

• Rollup merge of #126125 - dev-ardi:conflict-markers, r=estebank

  Show description for 73cc4ec
  matthiaskrgr

  authored
  73cc4ec

  Copy full SHA for 73cc4ec

• Rollup merge of #126481 - ChrisDenton:powerpc-unkown-openbsd, r=ehuss

  Show description for 0c1d396
  matthiaskrgr

  authored
  0c1d396

  Copy full SHA for 0c1d396

• Rollup merge of #126613 - tgross35:log-test-update, r=cuviper

  Show description for 7a827d3
  matthiaskrgr

  authored
  7a827d3

  Copy full SHA for 7a827d3

• Rollup merge of #126617 - sayantn:veorq, r=workingjubilee

  Show description for 2b7f6e2
  matthiaskrgr

  authored
  2b7f6e2

  Copy full SHA for 2b7f6e2

• Rollup merge of #126700 - compiler-errors:fragment, r=fmease

  Show description for 3bd84f1
  matthiaskrgr

  authored
  3bd84f1

  Copy full SHA for 3bd84f1

• Rollup merge of #126707 - ferrocene:hoverbear/fix-inaccessible-temp-dir, r=jieyouxu

  Show description for 520118b
  matthiaskrgr

  authored
  520118b

  Copy full SHA for 520118b

• Rollup merge of #126767 - compiler-errors:static-foreign-item, r=spastorino

  Show description for f577d80
  matthiaskrgr

  authored
  f577d80

  Copy full SHA for f577d80

• Rollup merge of #126774 - nnethercote:fix-126751, r=oli-obk

  Show description for d86736c
  matthiaskrgr

  authored
  d86736c

  Copy full SHA for d86736c