diff options
| author | bors <bors@rust-lang.org> | 2019-11-05 20:22:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-05 20:22:27 +0000 |
| commit | 1423bec54cf2db283b614e527cfd602b481485d1 (patch) | |
| tree | 8be41192c0d558c2b4f16e8c3d174f2b3552d5e8 /src/libsyntax_pos | |
| parent | 3a1b3b30c6cdd674049b144a3ced7b711de962b2 (diff) | |
| parent | 135b7841829c5bb67e584bf57610139f55c7a10f (diff) | |
| download | rust-1423bec54cf2db283b614e527cfd602b481485d1.tar.gz rust-1423bec54cf2db283b614e527cfd602b481485d1.zip | |
Auto merge of #66121 - pietroalbini:rollup-8zrwe7l, r=pietroalbini
Rollup of 8 pull requests
Successful merges:
- #65948 (Improve MaybeUninit::get_{ref,mut} documentation)
- #65953 (Allow specifying LLVM's MCTargetOptions::ABIName in target specification files)
- #66012 (De-querify `trivial_dropck_outlives`.)
- #66025 (`Span` cannot represent `span.hi < span.lo`)
- #66047 (Don't double-count `simd_shuffle` promotion candidates)
- #66053 (when Miri tests are not passing, do not add Miri component)
- #66082 (clean highlightSourceLines code)
- #66091 (Implemented the home_dir for VxWorks)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libsyntax_pos')
| -rw-r--r-- | src/libsyntax_pos/lib.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs index 9034f8c1afd..dc29b189639 100644 --- a/src/libsyntax_pos/lib.rs +++ b/src/libsyntax_pos/lib.rs @@ -1512,7 +1512,6 @@ pub type FileLinesResult = Result<FileLines, SpanLinesError>; #[derive(Clone, PartialEq, Eq, Debug)] pub enum SpanLinesError { - IllFormedSpan(Span), DistinctSources(DistinctSources), } |