Skip to content

Commit

Permalink
Remove the alt_std_name option
Browse files Browse the repository at this point in the history
This option introduced in rust-lang#15820 allows a custom crate to be imported in
the place of std, but with the name std. I don't think there is any
value to this. At most it is confusing users of a driver that uses this option. There are no users of
this option on github. If anyone still needs it, they can emulate it
injecting #![no_core] in addition to their own prelude.
  • Loading branch information
bjorn3 committed Feb 11, 2022
1 parent 78450d2 commit 55ceed8
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ pub fn inject(
mut krate: ast::Crate,
resolver: &mut dyn ResolverExpand,
sess: &Session,
alt_std_name: Option<Symbol>,
) -> ast::Crate {
let edition = sess.parse_sess.edition;

Expand Down Expand Up @@ -53,7 +52,7 @@ pub fn inject(
span,
ident,
vec![cx.attribute(cx.meta_word(span, sym::macro_use))],
ast::ItemKind::ExternCrate(alt_std_name),
ast::ItemKind::ExternCrate(None),
),
);
}
Expand Down
3 changes: 1 addition & 2 deletions compiler/rustc_interface/src/passes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@ pub fn configure_and_expand(
rustc_builtin_macros::register_builtin_macros(resolver);

krate = sess.time("crate_injection", || {
let alt_std_name = sess.opts.alt_std_name.as_ref().map(|s| Symbol::intern(s));
rustc_builtin_macros::standard_library_imports::inject(krate, resolver, sess, alt_std_name)
rustc_builtin_macros::standard_library_imports::inject(krate, resolver, sess)
});

util::check_attr_crate_type(sess, &krate.attrs, &mut resolver.lint_buffer());
Expand Down
2 changes: 0 additions & 2 deletions compiler/rustc_session/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,6 @@ impl Default for Options {
externs: Externs(BTreeMap::new()),
extern_dep_specs: ExternDepSpecs(BTreeMap::new()),
crate_name: None,
alt_std_name: None,
libs: Vec::new(),
unstable_features: UnstableFeatures::Disallow,
debug_assertions: true,
Expand Down Expand Up @@ -2382,7 +2381,6 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
unstable_features: UnstableFeatures::from_environment(crate_name.as_deref()),
extern_dep_specs,
crate_name,
alt_std_name: None,
libs,
debug_assertions,
actually_rustdoc: false,
Expand Down
4 changes: 0 additions & 4 deletions compiler/rustc_session/src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,6 @@ top_level_options!(
externs: Externs [UNTRACKED],
extern_dep_specs: ExternDepSpecs [UNTRACKED],
crate_name: Option<String> [TRACKED],
/// An optional name to use as the crate for std during std injection,
/// written `extern crate name as std`. Defaults to `std`. Used by
/// out-of-tree drivers.
alt_std_name: Option<String> [TRACKED],
/// Indicates how the compiler should treat unstable features.
unstable_features: UnstableFeatures [TRACKED],

Expand Down

0 comments on commit 55ceed8

Please sign in to comment.