Code

Rollup of 5 pull requests#46574

Code

Merged

bors merged 12 commits intorust-lang:masterrust-lang/rust:masterfrom GuillaumeGomez:rollupGuillaumeGomez/rust:rollupCopy head branch name to clipboardDec 8, 2017

+206-40

Commits

Commits on Dec 1, 2017

• doc: macro cfg! evaluating at compile-time

  liigo

  committed
  9e281cc

  Copy full SHA for 9e281cc

Commits on Dec 2, 2017

• Move colors to main.css

  GuillaumeGomez

  committed
  dddf183

  Copy full SHA for dddf183

Commits on Dec 6, 2017

• Do not automatically merge Cargo.lock

  oli-obk

  committed
  77faf79

  Copy full SHA for 77faf79

Commits on Dec 7, 2017

• Adds language to the documentation for Option and Result suggesting

  Show description for 9307917
  

  Jonathan Strong

  committed
  9307917

  Copy full SHA for 9307917

• adds links to methods, removes trailing whitespace

  

  Jonathan Strong

  committed
  5847d0b

  Copy full SHA for 5847d0b

• Greatly improve sidebar when width < 700px

  GuillaumeGomez

  committed
  71b70fe

  Copy full SHA for 71b70fe

• Fix JS errors

  GuillaumeGomez

  committed
  423e5ac

  Copy full SHA for 423e5ac

• Rollup merge of rust-lang#46416 - liigo:cfg-macro, r=steveklabnik

  Show description for 912def3
  GuillaumeGomez

  authored
  912def3

  Copy full SHA for 912def3

• Rollup merge of rust-lang#46444 - GuillaumeGomez:css-cleanup, r=QuietMisdreavus

  Show description for 14f2bc0
  GuillaumeGomez

  authored
  14f2bc0

  Copy full SHA for 14f2bc0

• Rollup merge of rust-lang#46526 - GuillaumeGomez:mobile-sidebar, r=QuietMisdreavus

  Show description for 1b7ea6d
  GuillaumeGomez

  authored
  1b7ea6d

  Copy full SHA for 1b7ea6d

• Rollup merge of rust-lang#46539 - oli-obk:cargo_lock, r=alexcrichton

  Show description for 655303c
  GuillaumeGomez

  authored
  655303c

  Copy full SHA for 655303c

• Rollup merge of rust-lang#46548 - jonathanstrong:master, r=dtolnay

  Show description for 0b47f02
  GuillaumeGomez

  authored
  0b47f02

  Copy full SHA for 0b47f02