diff options
| author | bors <bors@rust-lang.org> | 2019-06-19 16:37:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-19 16:37:58 +0000 |
| commit | 5e0c6a69e075d9c7d19e28264bb8941f72ecaf4e (patch) | |
| tree | 340f2e3775fb368108e2fe31ba8b24c9aa521111 /src/tools | |
| parent | e79b2a18a21e6b178d73473bb8fdbf3d18c66051 (diff) | |
| parent | bf6c505c23a1026282cc0518743c9cd6e727c2aa (diff) | |
| download | rust-5e0c6a69e075d9c7d19e28264bb8941f72ecaf4e.tar.gz rust-5e0c6a69e075d9c7d19e28264bb8941f72ecaf4e.zip | |
Auto merge of #61962 - Centril:rollup-y6sg1zw, r=Centril
Rollup of 4 pull requests Successful merges: - #60667 ( Add functions for building raw slices to libcore ) - #61547 (Support `cfg` and `cfg_attr` on generic parameters) - #61861 (Update rustfmt and rls) - #61940 (Make Place::ty iterate) Failed merges: r? @ghost
Diffstat (limited to 'src/tools')
| m--------- | src/tools/rls | 0 | ||||
| m--------- | src/tools/rustfmt | 26 |
2 files changed, 21 insertions, 5 deletions
diff --git a/src/tools/rls b/src/tools/rls -Subproject 483dcbc73f9923e98c71ec9df11ee3d0d5cfb46 +Subproject 3e519650cea91a4b785cd773a3e5965553f7424 diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject 5274b49caa1a7db6ac10c76bf1a3d5710ccef56 +Subproject d33450247b17d92a951d9663822c5a3635a37dd |
