This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 146dc67

committed

May 3, 2017

Auto merge of #41717 - frewsxcv:rollup, r=frewsxcv

Rollup of 7 pull requests - Successful merges: #41217, #41625, #41640, #41653, #41656, #41657, #41705 - Failed merges:

2 parents 0634f0a + 2b51384 commit 146dc67Copy full SHA for 146dc67

74 files changed

+1355

-5523

lines changed

src
- grammar
- libcore/sync
  - atomic.rs
- librustc_back/target
  - arm_linux_androideabi.rs
  - armv7_linux_androideabi.rs
- librustc_borrowck/borrowck
  - gather_loans
    - move_error.rs
  - mir
    - elaborate_drops.rs
    - mod.rs
  - mod.rs
- librustc_driver
- librustc_metadata
- librustc_mir
  - build
    - into.rs
    - mod.rs
  - callgraph.rs
  - hair/cx
    - mod.rs
  - lib.rs
  - mir_map.rs
  - shim.rs
  - transform
  - util
- librustc_passes
  - mir_stats.rs
- librustc_trans
  - collector.rs
- librustc_typeck/check
  - mod.rs
- librustc
  - dep_graph
  - hir/map
    - mod.rs
  - lib.rs
  - middle
    - cstore.rs
    - stability.rs
  - mir
  - session
    - config.rs
    - mod.rs
  - ty
- test
  - mir-opt
  - ui/issue-40402-ref-hints
    - issue-40402-1.stderr
- tools/compiletest/src
  - runtest.rs

74 files changed

+1355

-5523

lines changed

`‎src/grammar/.gitignore`

This file was deleted.

`‎src/grammar/README.md`

This file was deleted.

Comments

(0)