about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-18 17:07:21 +0000
committerbors <bors@rust-lang.org>2018-04-18 17:07:21 +0000
commitc8fa49f83b78cb80b74d7a61ade32a4cc980bfdc (patch)
tree49e1c33408de81fb82b301e1a8c55d8d099233af /src/libsyntax
parent3dfda165259bf6beefab31bf8708bdf3ec505fe0 (diff)
parent084d2bc47976412a97a3c30be91d2b97ec690308 (diff)
downloadrust-c8fa49f83b78cb80b74d7a61ade32a4cc980bfdc.tar.gz
rust-c8fa49f83b78cb80b74d7a61ade32a4cc980bfdc.zip
Auto merge of #50006 - rcoh:reorder-compiler-builtins, r=oli-obk
Reorder injection of std to get better compilation error

Per #49851, reorder injection imports to get a better error message.

r? @oli-obk
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/std_inject.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/std_inject.rs b/src/libsyntax/std_inject.rs
index bba7a2d7377..53dc19ba37d 100644
--- a/src/libsyntax/std_inject.rs
+++ b/src/libsyntax/std_inject.rs
@@ -57,7 +57,8 @@ pub fn maybe_inject_crates_ref(mut krate: ast::Crate, alt_std_name: Option<&str>
         &["std"]
     };
 
-    for name in names {
+    // .rev() to preserve ordering above in combination with insert(0, ...)
+    for name in names.iter().rev() {
         krate.module.items.insert(0, P(ast::Item {
             attrs: vec![attr::mk_attr_outer(DUMMY_SP,
                                             attr::mk_attr_id(),