diff options
| author | bors <bors@rust-lang.org> | 2021-08-02 02:33:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-02 02:33:16 +0000 |
| commit | effea9a2a0d501db5722d507690a1a66236933bf (patch) | |
| tree | e504e13021242bcf417a32729de4f8101471d6bf /compiler | |
| parent | 24bbf7ac2fd6f5e71f5a4873baa4456e45bd648d (diff) | |
| parent | 0851841970f3bcc7616ff7f9c837e19d52c5e0dd (diff) | |
| download | rust-effea9a2a0d501db5722d507690a1a66236933bf.tar.gz rust-effea9a2a0d501db5722d507690a1a66236933bf.zip | |
Auto merge of #87689 - JohnTitor:rollup-ns38b56, r=JohnTitor
Rollup of 13 pull requests Successful merges: - #86183 (Change environment variable getters to error recoverably) - #86439 (Remove `Ipv4Addr::is_ietf_protocol_assignment`) - #86509 (Move `os_str_bytes` to `sys::unix`) - #86593 (Partially stabilize `const_slice_first_last`) - #86936 (Add documentation for `Ipv6MulticastScope`) - #87282 (Ensure `./x.py dist` adheres to `build.tools`) - #87468 (Update rustfmt) - #87504 (Update mdbook.) - #87608 (Remove unused field `Session.system_library_path`) - #87629 (Consistent spelling of "adapter" in the standard library) - #87633 (Update compiler_builtins to fix i128 shift/mul on thumbv6m) - #87644 (Recommend `swap_remove` in `Vec::remove` docs) - #87653 (mark a UB doctest as no_run) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_session/src/session.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs index 369af437c43..9ab6dbb1ea9 100644 --- a/compiler/rustc_session/src/session.rs +++ b/compiler/rustc_session/src/session.rs @@ -198,10 +198,6 @@ pub struct Session { /// exist under `std`. For example, wrote `str::from_utf8` instead of `std::str::from_utf8`. pub confused_type_with_std_module: Lock<FxHashMap<Span, Span>>, - /// Path for libraries that will take preference over libraries shipped by Rust. - /// Used by windows-gnu targets to priortize system mingw-w64 libraries. - pub system_library_path: OneThread<RefCell<Option<Option<PathBuf>>>>, - /// Tracks the current behavior of the CTFE engine when an error occurs. /// Options range from returning the error without a backtrace to returning an error /// and immediately printing the backtrace to stderr. @@ -1375,7 +1371,6 @@ pub fn build_session( driver_lint_caps, trait_methods_not_found: Lock::new(Default::default()), confused_type_with_std_module: Lock::new(Default::default()), - system_library_path: OneThread::new(RefCell::new(Default::default())), ctfe_backtrace, miri_unleashed_features: Lock::new(Default::default()), asm_arch, |