diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-18 22:29:07 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-27 13:56:54 +0300 |
| commit | 4d535bdf59136f69b55107caaa0f5492b5e84d2d (patch) | |
| tree | 656d97ef9c892f9671aa8aae29c990da3662c61b /src/librustc_interface | |
| parent | f6eda9937956667c01bc567ab4a9bd6a19f71635 (diff) | |
| download | rust-4d535bdf59136f69b55107caaa0f5492b5e84d2d.tar.gz rust-4d535bdf59136f69b55107caaa0f5492b5e84d2d.zip | |
Move standard library injection into libsyntax_ext
Diffstat (limited to 'src/librustc_interface')
| -rw-r--r-- | src/librustc_interface/passes.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs index 58edb898c25..c7be6276f4a 100644 --- a/src/librustc_interface/passes.rs +++ b/src/librustc_interface/passes.rs @@ -278,7 +278,12 @@ pub fn register_plugins<'a>( krate = time(sess, "crate injection", || { let alt_std_name = sess.opts.alt_std_name.as_ref().map(|s| &**s); - syntax::std_inject::maybe_inject_crates_ref(krate, alt_std_name, sess.edition()) + let (krate, name) = + syntax_ext::standard_library_imports::inject(krate, alt_std_name, sess.edition()); + if let Some(name) = name { + sess.parse_sess.injected_crate_name.set(name); + } + krate }); let registrars = time(sess, "plugin loading", || { |