diff options
| author | bors <bors@rust-lang.org> | 2019-03-13 14:59:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-13 14:59:05 +0000 |
| commit | 8bf1f1c8f4100247c1f9b3d9b7aecea5c970263e (patch) | |
| tree | ff2b2fc46ded701458c0ab7b1c124bffd6f52bb9 /src/libstd/sys/unix/stack_overflow.rs | |
| parent | cf6d881ac1f348e8cf16d8b9177d7dff39fd2570 (diff) | |
| parent | 1d6f4d66ad9004d406169742c3098748a0419384 (diff) | |
| download | rust-8bf1f1c8f4100247c1f9b3d9b7aecea5c970263e.tar.gz rust-8bf1f1c8f4100247c1f9b3d9b7aecea5c970263e.zip | |
Auto merge of #58349 - petrochenkov:uni201x, r=pnkfelix
resolve: Simplify import resolution for mixed 2015/2018 edition mode Non-controversial part of https://github.com/rust-lang/rust/pull/57745. Before: | Local edition (per-span) | Global edition (--edition) | Imports (`use foo;`) | Absolute paths (`::foo`) | | ------------- |----------------|-----------------------------------------|------------------------------------------------| | 2018 | Any | Uniform | Extern prelude | | 2015 | 2015 | Crate-relative | Crate-relative | | 2015 | 2018 | Crate-relative with fallback to Uniform (future-proofed to error if the result is not Crate-relative or from Extern prelude) | Crate-relative with fallback to Extern prelude | After: | Local edition (per-span) | Global edition (--edition) | Imports (`use foo;`) | Absolute paths (`::foo`) | | ------------- |----------------|-----------------------------------------|------------------------------------------------| | 2018 | Any | Uniform | Extern prelude | | 2015 | 2015 | Crate-relative | Crate-relative | | 2015 | 2018 | Crate-relative with fallback to Extern prelude | Crate-relative with fallback to Extern prelude | I.e. only the behavior of the mixed local-2015-global-2018 mode is changed. This mixed mode has two goals: - Address regressions from https://github.com/rust-lang/rust/pull/56053#issuecomment-440826397. Both "before" and "after" variants address those regressions. - Be retrofit-able to "full 2015" edition (https://github.com/rust-lang/rust/pull/57745). Any more complex fallback scheme (with more candidates) than "Crate-relative with fallback to Extern prelude" will give more regressions than https://github.com/rust-lang/rust/pull/57745#issuecomment-455855089 and is therefore less retrofit-able while also being, well, more complex. So, we can settle on "Crate-relative with fallback to Extern prelude". (I'll hopefully proceed with https://github.com/rust-lang/rust/pull/57745 after mid-February.) r? @Centril
Diffstat (limited to 'src/libstd/sys/unix/stack_overflow.rs')
0 files changed, 0 insertions, 0 deletions