Skip to content

expand: Micro-optimize prelude injection #144587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ pub fn inject(
ast::ItemKind::ExternCrate(None, Ident::new(name, ident_span)),
);

krate.items.insert(0, item);

let root = (edition == Edition2015).then_some(kw::PathRoot);

let import_path = root
Expand All @@ -75,6 +73,6 @@ pub fn inject(
}),
);

krate.items.insert(0, use_item);
krate.items.splice(0..0, [item, use_item]);
krate.items.len() - orig_num_items
}
4 changes: 2 additions & 2 deletions tests/pretty/asm.pp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-mode:expanded
//@ pp-exact:asm.pp
//@ only-x86_64
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/cast-lt.pp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:expanded
//@ pp-exact:cast-lt.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/dollar-crate.pp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:expanded
//@ pp-exact:dollar-crate.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/expanded-and-path-remap-80832.pp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
// Test for issue 80832
//
//@ pretty-mode:expanded
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/format-args-str-escape.pp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:expanded
//@ pp-exact:format-args-str-escape.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/hir-delegation.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

#![allow(incomplete_features)]
#![feature(fn_delegation)]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;

fn b<C>(e: C) { }

Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/hir-fn-params.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:hir
//@ pp-exact:hir-fn-params.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/hir-fn-variadic.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
//@ pp-exact:hir-fn-variadic.pp

#![feature(c_variadic)]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;

extern "C" {
unsafe fn foo(x: i32, va1: ...);
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/hir-if-else.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:hir
//@ pp-exact:hir-if-else.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/hir-lifetimes.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
// This tests the pretty-printing of lifetimes in lots of ways.

#![allow(unused)]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;

struct Foo<'a> {
x: &'a u32,
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/hir-pretty-attr.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:hir
//@ pp-exact:hir-pretty-attr.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/hir-pretty-loop.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:hir
//@ pp-exact:hir-pretty-loop.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/hir-struct-expr.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:hir
//@ pp-exact:hir-struct-expr.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/if-else.pp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:expanded
//@ pp-exact:if-else.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/issue-12590-c.pp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:expanded
//@ pp-exact:issue-12590-c.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/issue-4264.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-compare-only
//@ pretty-mode:hir,typed
//@ pp-exact:issue-4264.pp
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/issue-85089.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
// Test to print lifetimes on HIR pretty-printing.

//@ pretty-compare-only
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/never-pattern.pp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#![allow(incomplete_features)]
#![feature(never_patterns)]
#![feature(never_type)]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;

fn f(x: Result<u32, !>) { _ = match x { Ok(x) => x, Err(!) , }; }

Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/pin-ergonomics-hir.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

#![feature(pin_ergonomics)]
#![allow(dead_code, incomplete_features)]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;

use std::pin::Pin;

Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/postfix-match/precedence.pp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#![feature(prelude_import)]
#![no_std]
#![feature(postfix_match)]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;

use std::ops::Add;

Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/shebang-at-top.pp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/env rust
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ pretty-mode:expanded
//@ pp-exact:shebang-at-top.pp
//@ pretty-compare-only
Expand Down
4 changes: 2 additions & 2 deletions tests/pretty/tests-are-sorted.pp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ compile-flags: --crate-type=lib --test --remap-path-prefix={{src-base}}/=/the/src/ --remap-path-prefix={{src-base}}\=/the/src/
//@ pretty-compare-only
//@ pretty-mode:expanded
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/asm/unpretty-expanded.stdout
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ needs-asm-support
//@ check-pass
//@ compile-flags: -Zunpretty=expanded
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#![feature(prelude_import)]
#[prelude_import]
use std::prelude::rust_2021::*;
#[macro_use]
extern crate std;
#[prelude_import]
use std::prelude::rust_2021::*;
//@ edition: 2021
//@ compile-flags: -Zunpretty=expanded
//@ check-pass
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/codemap_tests/unicode.expanded.stdout
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ revisions: normal expanded
//@[expanded] check-pass
//@[expanded]compile-flags: -Zunpretty=expanded
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/const-generics/defaults/pretty-printing-ast.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
//@ edition: 2015

#![crate_type = "lib"]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;

trait Foo<const KIND : bool = true> {}

Expand Down
4 changes: 2 additions & 2 deletions tests/ui/deriving/built-in-proc-macro-scope.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
//@ edition:2015

#![feature(derive_coerce_pointee)]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;

#[macro_use]
extern crate another_proc_macro;
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/deriving/deriving-all-codegen.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
#![crate_type = "lib"]
#![allow(dead_code)]
#![allow(deprecated)]
#[prelude_import]
use std::prelude::rust_2021::*;
#[macro_use]
extern crate std;
#[prelude_import]
use std::prelude::rust_2021::*;

// Empty struct.
struct Empty;
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/deriving/deriving-coerce-pointee-expanded.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
//@ compile-flags: -Zunpretty=expanded
//@ edition: 2015
#![feature(derive_coerce_pointee)]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
use std::marker::CoercePointee;

pub trait MyTrait<T: ?Sized> {}
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/deriving/proc-macro-attribute-mixing.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
//@ edition: 2015

#![feature(derive_coerce_pointee)]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;

#[macro_use]
extern crate another_proc_macro;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(prelude_import)]
#![no_std]
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
// This ensures that ICEs like rust#94953 don't happen
//@ check-pass
//@ compile-flags: -Z unpretty=expanded
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/macros/genercs-in-path-with-prettry-hir.stdout
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[attr = MacroUse {arguments: UseAll}]
extern crate std;
#[prelude_import]
use ::std::prelude::rust_2015::*;
//@ compile-flags: -Zunpretty=hir
//@ edition: 2015

Expand Down
Loading
Loading