Code

Detect diff markers in the parser#106242

Code

Merged

bors merged 4 commits intorust-lang:masterrust-lang/rust:masterfrom estebank:diff-markersestebank/rust:diff-markersCopy head branch name to clipboardDec 29, 2022

+438-5

Commits

Commits on Dec 29, 2022

• Detect diff markers in the parser

  Show description for 375f025
  estebank

  committed
  375f025

  Copy full SHA for 375f025

• Account for ADT bodies and struct expressions

  estebank

  committed
  38fd5a9

  Copy full SHA for 38fd5a9

• Tweak wording

  estebank

  committed
  698ebe3

  Copy full SHA for 698ebe3

• Add support for diff3 format

  estebank

  committed
  62c8e31

  Copy full SHA for 62c8e31