diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2019-11-01 13:46:05 +0100 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2019-11-01 15:05:45 +0100 |
| commit | d21f9b7fd6d4e41257bb4a6db64e9873767374dc (patch) | |
| tree | 26e0a471861b57531dec4e64350b2c16fd0250a6 /src/librustc/ty | |
| parent | d3d28a49209a21628fda0245b631e5fc3465be1a (diff) | |
| download | rust-d21f9b7fd6d4e41257bb4a6db64e9873767374dc.tar.gz rust-d21f9b7fd6d4e41257bb4a6db64e9873767374dc.zip | |
targeted revert of PR rust-lang/rust#64324 (just undo change to dylib generics export).
Includes the anticipated fallout to run-make-fulldeps test suite from this change. (We need to reopen issue 64319 as part of landing this.)
Diffstat (limited to 'src/librustc/ty')
| -rw-r--r-- | src/librustc/ty/context.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs index bdf9b2d7f3f..8d8974c6cbb 100644 --- a/src/librustc/ty/context.rs +++ b/src/librustc/ty/context.rs @@ -1514,8 +1514,14 @@ impl<'tcx> TyCtxt<'tcx> { CrateType::Executable | CrateType::Staticlib | CrateType::ProcMacro | - CrateType::Dylib | CrateType::Cdylib => false, + + // FIXME rust-lang/rust#64319, rust-lang/rust#64872: + // We want to block export of generics from dylibs, + // but we must fix rust-lang/rust#65890 before we can + // do that robustly. + CrateType::Dylib => true, + CrateType::Rlib => true, } }) |
