Code

Rollup of 9 pull requests#36627

Code

Closed

sophiajt wants to merge 20 commits intorust-lang:masterrust-lang/rust:masterfrom

sophiajt:rollupsophiajt/rust:rollupCopy head branch name to clipboard

Commits

Commits on Sep 16, 2016

• fix top level attr spans

  mikhail-m1

  committed
  82639d4

  Copy full SHA for 82639d4

Commits on Sep 18, 2016

• Fix name of error test file

  aclarry

  committed
  af67f0b

  Copy full SHA for af67f0b

Commits on Sep 19, 2016

• Replace 'e.g.' by 'i.e.'

  GuillaumeGomez

  committed
  313fb8f

  Copy full SHA for 313fb8f

• Add the ability to merge spans to codemap

  

  Jonathan Turner

  committed
  2ea3ab3

  Copy full SHA for 2ea3ab3

• fixed the safety header/wording in option.rs

  

  jacobpadkins

  committed
  8b02aa1

  Copy full SHA for 8b02aa1

Commits on Sep 20, 2016

• Lazily allocate TypedArena's first chunk.

  Show description for 80a4477
  nnethercote

  committed
  80a4477

  Copy full SHA for 80a4477

• Workaround #34427 by using memset of 0 on ARM to set the discriminant.

  pnkfelix

  committed
  c41a806

  Copy full SHA for c41a806

• Minor correction in `sort_by_key` doc comment

  caipre

  committed
  429ba7b

  Copy full SHA for 429ba7b

• Update E0560 to include label

  aclarry

  committed
  23efc54

  Copy full SHA for 23efc54

• Check for overlapping and simplify unit test

  

  Jonathan Turner

  committed
  e4b1842

  Copy full SHA for e4b1842

Commits on Sep 21, 2016

• Fix some typos and improve doc comments style

  GuillaumeGomez

  committed
  854ae8f

  Copy full SHA for 854ae8f

• Rollup merge of #36330 - aclarry:e0560-update, r=jonathandturner

  Show description for e632a1a
  

  Jonathan Turner

  authored
  e632a1a

  Copy full SHA for e632a1a

• Rollup merge of #36496 - pnkfelix:workaround-issue-34427, r=eddyb

  Show description for fe88e1b
  

  Jonathan Turner

  authored
  fe88e1b

  Copy full SHA for fe88e1b

• Rollup merge of #36539 - mikhail-m1:36530, r=jonathandturner

  Show description for 3f48843
  

  Jonathan Turner

  authored
  3f48843

  Copy full SHA for 3f48843

• Rollup merge of #36578 - GuillaumeGomez:fix_typo, r=steveklabnik

  Show description for d75b696
  

  Jonathan Turner

  authored
  d75b696

  Copy full SHA for d75b696

• Rollup merge of #36585 - jonathandturner:misc_error_touchups, r=nrc

  Show description for 3c2558a
  

  Jonathan Turner

  authored
  3c2558a

  Copy full SHA for 3c2558a

• Rollup merge of #36589 - jpadkins:option_docs_safety_wording_fix, r=bluss

  Show description for 5cd252c
  

  Jonathan Turner

  authored
  5cd252c

  Copy full SHA for 5cd252c

• Rollup merge of #36592 - nnethercote:TypedArena, r=bluss

  Show description for 846ff6d
  

  Jonathan Turner

  authored
  846ff6d

  Copy full SHA for 846ff6d

• Rollup merge of #36600 - caipre:sort-by-key-comment-fix, r=apasel422

  Show description for 5a6abc9
  

  Jonathan Turner

  authored
  5a6abc9

  Copy full SHA for 5a6abc9

• Rollup merge of #36623 - GuillaumeGomez:doc_typos, r=steveklabnik

  Show description for 708bfe0
  

  Jonathan Turner

  authored
  708bfe0

  Copy full SHA for 708bfe0