Code

Rollup of 10 pull requests#64946

Code

Merged

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

Centril:rollup-66mj5o0Centril/rust:rollup-66mj5o0Copy head branch name to clipboard

Oct 1, 2019

Commits

Commits on Sep 25, 2019

• Use `saturating_sub` where applicable

  AnthonyMikh

  authored
  2cb460e

  Copy full SHA for 2cb460e

• Use `max` instead of `if`s

  AnthonyMikh

  authored
  e9a93be

  Copy full SHA for e9a93be

• Simplify Unicode-aware trimming

  AnthonyMikh

  authored
  4fc5650

  Copy full SHA for 4fc5650

• Use map + sum instead of fold for computing Unicode width

  AnthonyMikh

  authored
  d6327e8

  Copy full SHA for d6327e8

• Use Option::map_or where applicable

  AnthonyMikh

  authored
  aef169b

  Copy full SHA for aef169b

• Unify order of variables in chained comparison

  AnthonyMikh

  authored
  9b447e2

  Copy full SHA for 9b447e2

• Simplify `Emitter::fix_multispan_in_std_macros`

  Show description for f93827f
  AnthonyMikh

  authored
  f93827f

  Copy full SHA for f93827f

• Use `sort_by_key` rather than `sort_by`

  AnthonyMikh

  authored
  ea32862

  Copy full SHA for ea32862

• Simplify `style_or_override`

  AnthonyMikh

  authored
  7a0725f

  Copy full SHA for 7a0725f

Commits on Sep 26, 2019

• Revert "Simplify Unicode-aware trimming"

  Show description for 75a7c27
  AnthonyMikh

  authored
  75a7c27

  Copy full SHA for 75a7c27

Commits on Sep 29, 2019

• syntax: recover trailing `|` in or-patterns.

  Centril

  committed
  3eba6c1

  Copy full SHA for 3eba6c1

Commits on Sep 30, 2019

• Fixed grammar for some `time` fn calls and a diagnostic.

  alexreg

  committed
  d938a80

  Copy full SHA for d938a80

• Added backticks for one diagnostic message.

  alexreg

  committed
  fdd1a62

  Copy full SHA for fdd1a62

• Fixed weird non-sequential indices for serialisation of `SourceFile` type.

  alexreg

  committed
  8a4af2f

  Copy full SHA for 8a4af2f

• Fixed grammar in one diagnostic and blessed tests.

  alexreg

  committed
  13b61b5

  Copy full SHA for 13b61b5

• Fixed stylistic convention for one diagnostic and blessed tests.

  alexreg

  committed
  49c6c86

  Copy full SHA for 49c6c86

• Cleaned up a few doc comments in libfmt_macros.

  alexreg

  committed
  33ed03f

  Copy full SHA for 33ed03f

• Remove legacy grammar

  XAMPPRocky

  committed
  96c8049

  Copy full SHA for 96c8049

• Stabilize macros in `extern` blocks

  Show description for 349259d
  petrochenkov

  committed
  349259d

  Copy full SHA for 349259d

• Stabilize proc macros in type positions

  petrochenkov

  committed
  5ae38bb

  Copy full SHA for 5ae38bb

• syntax: Split `ast::Attribute` into container and inner parts

  petrochenkov

  committed
  535d474

  Copy full SHA for 535d474

• Add test for #50571

  JohnTitor

  committed
  576c215

  Copy full SHA for 576c215

• Add test for #58022

  JohnTitor

  committed
  bc25746

  Copy full SHA for bc25746

• Add test for #58344

  JohnTitor

  committed
  9c73131

  Copy full SHA for 9c73131

• syntax: Support modern attribute syntax in the `meta` matcher

  petrochenkov

  committed
  957986d

  Copy full SHA for 957986d

• typeck: silence unreachable code from await

  Show description for 870b47f
  davidtwco

  committed
  870b47f

  Copy full SHA for 870b47f

• Simplify code for special case of annotation

  AnthonyMikh

  authored
  7dc953b

  Copy full SHA for 7dc953b

• Simplify `EmitterWriter::get_multispan_max_line_num`

  AnthonyMikh

  authored
  6b6a79b

  Copy full SHA for 6b6a79b

• Simplify `EmitterWriter::get_max_line_num`

  AnthonyMikh

  authored
  7b4c5c6

  Copy full SHA for 7b4c5c6

• Update doc comment for `style_or_override`

  AnthonyMikh

  authored
  21724ed

  Copy full SHA for 21724ed

• Simplify `EmitterWriter::emit_suggestion_default`

  Show description for 7a807c5
  AnthonyMikh

  authored
  7a807c5

  Copy full SHA for 7a807c5

• Remove redundant `.iter_mut()`

  AnthonyMikh

  authored
  9d73176

  Copy full SHA for 9d73176

• Simplify a conditional in `collect_annotations`

  Show description for 55b5428
  AnthonyMikh

  authored
  55b5428

  Copy full SHA for 55b5428

• Address review comments

  petrochenkov

  committed
  6ea4a52

  Copy full SHA for 6ea4a52

• Use pattern matching instead of indexing tuples

  AnthonyMikh

  authored
  bb44288

  Copy full SHA for bb44288

• async/await: improve obligation errors

  Show description for 04fa9b1
  davidtwco

  committed
  04fa9b1

  Copy full SHA for 04fa9b1

• (fmt) remove trailing whitespaces

  AnthonyMikh

  authored
  e5db5b3

  Copy full SHA for e5db5b3

• Fix errors

  AnthonyMikh

  authored
  61bc38e

  Copy full SHA for 61bc38e

• Ascript type explicitly

  AnthonyMikh

  authored
  515262c

  Copy full SHA for 515262c

Commits on Oct 1, 2019

• Hint type for `.sum()`

  AnthonyMikh

  authored
  fdce416

  Copy full SHA for fdce416

• Fix borrowck errors

  Show description for 50c2a58
  AnthonyMikh

  authored
  50c2a58

  Copy full SHA for 50c2a58

• Deduplicate closure type errors

  Show description for 13e9b3d
  estebank

  committed
  13e9b3d

  Copy full SHA for 13e9b3d

• Rollup merge of #63674 - petrochenkov:meta2, r=Centril

  Show description for 64130fd
  Centril

  authored
  64130fd

  Copy full SHA for 64130fd

• Rollup merge of #63931 - petrochenkov:stabmac, r=Centril

  Show description for 3bd34e0
  Centril

  authored
  3bd34e0

  Copy full SHA for 3bd34e0

• Rollup merge of #64887 - Centril:recover-trailing-vert, r=estebank

  Show description for f45de9a
  Centril

  authored
  f45de9a

  Copy full SHA for f45de9a

• Rollup merge of #64895 - davidtwco:issue-64130-async-error-definition, r=nikomatsakis

  Show description for 25f774a
  Centril

  authored
  25f774a

  Copy full SHA for 25f774a

• Rollup merge of #64896 - XAMPPRocky:remove-grammar, r=Centril

  Show description for b8c5d3a
  Centril

  authored
  b8c5d3a

  Copy full SHA for b8c5d3a

• Rollup merge of #64907 - alexreg:tidy-up, r=Mark-Simulacrum

  Show description for 24a84fa
  Centril

  authored
  24a84fa

  Copy full SHA for 24a84fa

• Rollup merge of #64928 - JohnTitor:add-some-tests, r=Centril

  Show description for dc1c1fe
  Centril

  authored
  dc1c1fe

  Copy full SHA for dc1c1fe

• Rollup merge of #64930 - davidtwco:issue-61798-diverging-await, r=petrochenkov

  Show description for f4aa29f
  Centril

  authored
  f4aa29f

  Copy full SHA for f4aa29f

• Rollup merge of #64935 - AnthonyMikh:librustc_errors/emmiter__code-clarity, r=estebank

  Show description for 5c6a8ee
  Centril

  authored
  5c6a8ee

  Copy full SHA for 5c6a8ee

• Rollup merge of #64937 - estebank:dedup-closure-err, r=Centril

  Show description for 46bf6ad
  Centril

  authored
  46bf6ad

  Copy full SHA for 46bf6ad