]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 87990a1 445e404)
Auto merge of #47767 - estebank:as-suggestion, r=petrochenkov
authorbors <bors@rust-lang.org>
Sun, 28 Jan 2018 07:44:14 +0000 (07:44 +0000)
committerbors <bors@rust-lang.org>
Sun, 28 Jan 2018 07:44:14 +0000 (07:44 +0000)
commit7046a406232695b581579f8e2468601260ea2199
treeb6c17a098f2035b5ed43d3f7040b8c9047cc8349tree | snapshot
parent87990a119aa1ce77f294253cde836518870b8032commit | diff
parent445e404ba4c9782e4f5028eccb7c9473ae33c70acommit | diff
Auto merge of #47767 - estebank:as-suggestion, r=petrochenkov

Correctly format `extern crate` conflict resolution help

Closes #45799. Follow up to @Cldfire's #45820.

If the `extern` statement that will have a suggestion ends on a `;`, synthesize a new span that doesn't include it.
src/librustc_resolve/lib.rs diff1 | diff2 | blob | history
src/libsyntax/parse/parser.rs diff1 | diff2 | blob | history
Empowering everyone to build reliable and efficient software.