Skip to content

Commit 185b9ac

Browse files
borsbors
committed
Auto merge of #62961 - Centril:rollup-kydeswa, r=Centril
Rollup of 9 pull requests Successful merges: - #61727 (Add binary dependencies to dep-info files) - #62736 (Polonius: fix some cases of `killed` fact generation, and most of the `ui` test suite) - #62758 (ci: Install clang on Windows through tarballs) - #62784 (Add riscv32i-unknown-none-elf target) - #62814 (add support for hexagon-unknown-linux-musl) - #62827 (Don't link mcjit/interpreter LLVM components) - #62901 (cleanup: Remove `extern crate serialize as rustc_serialize`s) - #62903 (Support SDKROOT env var on iOS) - #62906 (Require a value for configure --debuginfo-level) Failed merges: - #62910 (cleanup: Remove lint annotations in specific crates that are already enforced by rustbuild) r? @ghost
2 parents 03f19f7 + 0340d72 commit 185b9ac

File tree

115 files changed

+1198
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+1198
-229
lines changed

Diff for: ‎.azure-pipelines/steps/install-clang.yml

+12-6
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,18 @@ steps:
2626
#
2727
# Original downloaded here came from
2828
# http://releases.llvm.org/7.0.0/LLVM-7.0.0-win64.exe
29-
- script: |
30-
powershell -Command "$ProgressPreference = 'SilentlyContinue'; iwr -outf %TEMP%\LLVM-7.0.0-win64.exe https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-7.0.0-win64.exe"
31-
set CLANG_DIR=%CD%\citools\clang-rust
32-
%TEMP%\LLVM-7.0.0-win64.exe /S /NCRC /D=%CLANG_DIR%
33-
set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=%CLANG_DIR%\bin\clang-cl.exe
34-
echo ##vso[task.setvariable variable=RUST_CONFIGURE_ARGS]%RUST_CONFIGURE_ARGS%
29+
# That installer was run through `wine` on Linux and then the resulting
30+
# installation directory (found in `$HOME/.wine/drive_c/Program Files/LLVM`) was
31+
# packaged up into a tarball. We've had issues otherwise that the installer will
32+
# randomly hang, provide not a lot of useful information, pollute global state,
33+
# etc. In general the tarball is just more confined and easier to deal with when
34+
# working with various CI environments.
35+
- bash: |
36+
set -e
37+
mkdir -p citools
38+
cd citools
39+
curl -f https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-7.0.0-win64.tar.gz | tar xzf -
40+
echo "##vso[task.setvariable variable=RUST_CONFIGURE_ARGS]$RUST_CONFIGURE_ARGS --set llvm.clang-cl=`pwd`/clang-rust/bin/clang-cl.exe"
3541
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
3642
displayName: Install clang (Windows)
3743

Diff for: ‎src/bootstrap/configure.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ def v(*args):
7676
o("llvm-assertions", "llvm.assertions", "build LLVM with assertions")
7777
o("debug-assertions", "rust.debug-assertions", "build with debugging assertions")
7878
o("llvm-release-debuginfo", "llvm.release-debuginfo", "build LLVM with debugger metadata")
79-
o("debuginfo-level", "rust.debuginfo-level", "debuginfo level for Rust code")
80-
o("debuginfo-level-rustc", "rust.debuginfo-level-rustc", "debuginfo level for the compiler")
81-
o("debuginfo-level-std", "rust.debuginfo-level-std", "debuginfo level for the standard library")
82-
o("debuginfo-level-tools", "rust.debuginfo-level-tools", "debuginfo level for the tools")
83-
o("debuginfo-level-tests", "rust.debuginfo-level-tests", "debuginfo level for the test suites run with compiletest")
79+
v("debuginfo-level", "rust.debuginfo-level", "debuginfo level for Rust code")
80+
v("debuginfo-level-rustc", "rust.debuginfo-level-rustc", "debuginfo level for the compiler")
81+
v("debuginfo-level-std", "rust.debuginfo-level-std", "debuginfo level for the standard library")
82+
v("debuginfo-level-tools", "rust.debuginfo-level-tools", "debuginfo level for the tools")
83+
v("debuginfo-level-tests", "rust.debuginfo-level-tests", "debuginfo level for the test suites run with compiletest")
8484
v("save-toolstates", "rust.save-toolstates", "save build and test status of external tools into this file")
8585

8686
v("prefix", "install.prefix", "set installation prefix")

Diff for: ‎src/ci/docker/dist-various-1/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ ENV TARGETS=$TARGETS,thumbv7em-none-eabihf
112112
ENV TARGETS=$TARGETS,thumbv8m.base-none-eabi
113113
ENV TARGETS=$TARGETS,thumbv8m.main-none-eabi
114114
ENV TARGETS=$TARGETS,thumbv8m.main-none-eabihf
115+
ENV TARGETS=$TARGETS,riscv32i-unknown-none-elf
115116
ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf
116117
ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf
117118
ENV TARGETS=$TARGETS,riscv64imac-unknown-none-elf

Diff for: ‎src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
5050
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
5151
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
5252
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.remap-debuginfo"
53-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.debuginfo-level-std=1"
53+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --debuginfo-level-std=1"
5454

5555
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
5656
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"

Diff for: ‎src/libcore/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
#![feature(cmpxchg16b_target_feature)]
121121
#![feature(rtm_target_feature)]
122122
#![feature(f16c_target_feature)]
123+
#![feature(hexagon_target_feature)]
123124
#![feature(const_slice_len)]
124125
#![feature(const_str_as_bytes)]
125126
#![feature(const_str_len)]

Diff for: ‎src/libpanic_unwind/gcc.rs

+3
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ const UNWIND_DATA_REG: (i32, i32) = (6, 7); // R6, R7
126126
#[cfg(target_arch = "sparc64")]
127127
const UNWIND_DATA_REG: (i32, i32) = (24, 25); // I0, I1
128128

129+
#[cfg(target_arch = "hexagon")]
130+
const UNWIND_DATA_REG: (i32, i32) = (0, 1); // R0, R1
131+
129132
// The following code is based on GCC's C and C++ personality routines. For reference, see:
130133
// https://github.com/gcc-mirror/gcc/blob/master/libstdc++-v3/libsupc++/eh_personality.cc
131134
// https://github.com/gcc-mirror/gcc/blob/trunk/libgcc/unwind-c.c

Diff for: ‎src/librustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ rustc_target = { path = "../librustc_target" }
2727
rustc_macros = { path = "../librustc_macros" }
2828
rustc_data_structures = { path = "../librustc_data_structures" }
2929
errors = { path = "../librustc_errors", package = "rustc_errors" }
30-
serialize = { path = "../libserialize" }
30+
rustc_serialize = { path = "../libserialize", package = "serialize" }
3131
syntax = { path = "../libsyntax" }
3232
syntax_pos = { path = "../libsyntax_pos" }
3333
backtrace = "0.3.3"

Diff for: ‎src/librustc/hir/def_id.rs

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::ty::{self, TyCtxt};
22
use crate::hir::map::definitions::FIRST_FREE_DEF_INDEX;
33
use rustc_data_structures::indexed_vec::Idx;
4-
use serialize;
54
use std::fmt;
65
use std::u32;
76

@@ -93,8 +92,8 @@ impl fmt::Display for CrateNum {
9392
}
9493
}
9594

96-
impl serialize::UseSpecializedEncodable for CrateNum {}
97-
impl serialize::UseSpecializedDecodable for CrateNum {}
95+
impl rustc_serialize::UseSpecializedEncodable for CrateNum {}
96+
impl rustc_serialize::UseSpecializedDecodable for CrateNum {}
9897

9998
newtype_index! {
10099
/// A DefIndex is an index into the hir-map for a crate, identifying a
@@ -134,8 +133,8 @@ impl DefIndex {
134133
}
135134
}
136135

137-
impl serialize::UseSpecializedEncodable for DefIndex {}
138-
impl serialize::UseSpecializedDecodable for DefIndex {}
136+
impl rustc_serialize::UseSpecializedEncodable for DefIndex {}
137+
impl rustc_serialize::UseSpecializedDecodable for DefIndex {}
139138

140139
/// A `DefId` identifies a particular *definition*, by combining a crate
141140
/// index and a def index.
@@ -186,8 +185,8 @@ impl DefId {
186185
}
187186
}
188187

189-
impl serialize::UseSpecializedEncodable for DefId {}
190-
impl serialize::UseSpecializedDecodable for DefId {}
188+
impl rustc_serialize::UseSpecializedEncodable for DefId {}
189+
impl rustc_serialize::UseSpecializedDecodable for DefId {}
191190

192191
/// A LocalDefId is equivalent to a DefId with `krate == LOCAL_CRATE`. Since
193192
/// we encode this information in the type, we can ensure at compile time that
@@ -220,5 +219,5 @@ impl fmt::Debug for LocalDefId {
220219
}
221220
}
222221

223-
impl serialize::UseSpecializedEncodable for LocalDefId {}
224-
impl serialize::UseSpecializedDecodable for LocalDefId {}
222+
impl rustc_serialize::UseSpecializedEncodable for LocalDefId {}
223+
impl rustc_serialize::UseSpecializedDecodable for LocalDefId {}

Diff for: ‎src/librustc/hir/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use rustc_data_structures::sync::{par_for_each_in, Send, Sync};
3434
use rustc_data_structures::thin_vec::ThinVec;
3535
use rustc_macros::HashStable;
3636

37-
use serialize::{self, Encoder, Encodable, Decoder, Decodable};
37+
use rustc_serialize::{self, Encoder, Encodable, Decoder, Decodable};
3838
use std::collections::{BTreeSet, BTreeMap};
3939
use std::fmt;
4040
use smallvec::SmallVec;
@@ -92,7 +92,7 @@ impl HirId {
9292
}
9393
}
9494

95-
impl serialize::UseSpecializedEncodable for HirId {
95+
impl rustc_serialize::UseSpecializedEncodable for HirId {
9696
fn default_encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
9797
let HirId {
9898
owner,
@@ -104,7 +104,7 @@ impl serialize::UseSpecializedEncodable for HirId {
104104
}
105105
}
106106

107-
impl serialize::UseSpecializedDecodable for HirId {
107+
impl rustc_serialize::UseSpecializedDecodable for HirId {
108108
fn default_decode<D: Decoder>(d: &mut D) -> Result<HirId, D::Error> {
109109
let owner = DefIndex::decode(d)?;
110110
let local_id = ItemLocalId::decode(d)?;

Diff for: ‎src/librustc/hir/ptr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::iter::FromIterator;
77
use std::ops::Deref;
88
use std::{slice, vec};
99

10-
use serialize::{Encodable, Decodable, Encoder, Decoder};
10+
use rustc_serialize::{Encodable, Decodable, Encoder, Decoder};
1111

1212
use rustc_data_structures::stable_hasher::{StableHasher, StableHasherResult,
1313
HashStable};

Diff for: ‎src/librustc/infer/canonical/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use crate::infer::region_constraints::MemberConstraint;
2727
use crate::mir::interpret::ConstValue;
2828
use rustc_data_structures::indexed_vec::IndexVec;
2929
use rustc_macros::HashStable;
30-
use serialize::UseSpecializedDecodable;
30+
use rustc_serialize::UseSpecializedDecodable;
3131
use smallvec::SmallVec;
3232
use std::ops::Index;
3333
use syntax::source_map::Span;

Diff for: ‎src/librustc/lib.rs

-8
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,8 @@ extern crate getopts;
7575
extern crate libc;
7676
#[macro_use] extern crate rustc_macros;
7777
#[macro_use] extern crate rustc_data_structures;
78-
7978
#[macro_use] extern crate log;
8079
#[macro_use] extern crate syntax;
81-
82-
// FIXME: This import is used by deriving `RustcDecodable` and `RustcEncodable`. Removing this
83-
// results in a bunch of "failed to resolve" errors. Hopefully, the compiler moves to serde or
84-
// something, and we can get rid of this.
85-
#[allow(rust_2018_idioms)]
86-
extern crate serialize as rustc_serialize;
87-
8880
#[macro_use] extern crate smallvec;
8981

9082
// Use the test crate here so we depend on getopts through it. This allow tools to link to both

Diff for: ‎src/librustc/lint/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate::lint::{LintArray, Level, Lint, LintId, LintPass, LintBuffer};
2323
use crate::lint::builtin::BuiltinLintDiagnostics;
2424
use crate::lint::levels::{LintLevelSets, LintLevelsBuilder};
2525
use crate::middle::privacy::AccessLevels;
26-
use crate::rustc_serialize::{Decoder, Decodable, Encoder, Encodable};
26+
use rustc_serialize::{Decoder, Decodable, Encoder, Encodable};
2727
use crate::session::{config, early_error, Session};
2828
use crate::ty::{self, print::Printer, subst::Kind, TyCtxt, Ty};
2929
use crate::ty::layout::{LayoutError, LayoutOf, TyLayout};

Diff for: ‎src/librustc/mir/cache.rs

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
use rustc_data_structures::indexed_vec::IndexVec;
22
use rustc_data_structures::sync::{RwLock, MappedReadGuard, ReadGuard};
3-
use rustc_data_structures::stable_hasher::{HashStable, StableHasher,
4-
StableHasherResult};
3+
use rustc_data_structures::stable_hasher::{HashStable, StableHasher, StableHasherResult};
4+
use rustc_serialize::{Encodable, Encoder, Decodable, Decoder};
55
use crate::ich::StableHashingContext;
66
use crate::mir::{Body, BasicBlock};
77

8-
use crate::rustc_serialize as serialize;
9-
108
#[derive(Clone, Debug)]
119
pub struct Cache {
1210
predecessors: RwLock<Option<IndexVec<BasicBlock, Vec<BasicBlock>>>>
1311
}
1412

1513

16-
impl serialize::Encodable for Cache {
17-
fn encode<S: serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
18-
serialize::Encodable::encode(&(), s)
14+
impl rustc_serialize::Encodable for Cache {
15+
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
16+
Encodable::encode(&(), s)
1917
}
2018
}
2119

22-
impl serialize::Decodable for Cache {
23-
fn decode<D: serialize::Decoder>(d: &mut D) -> Result<Self, D::Error> {
24-
serialize::Decodable::decode(d).map(|_v: ()| Self::new())
20+
impl rustc_serialize::Decodable for Cache {
21+
fn decode<D: Decoder>(d: &mut D) -> Result<Self, D::Error> {
22+
Decodable::decode(d).map(|_v: ()| Self::new())
2523
}
2624
}
2725

Diff for: ‎src/librustc/mir/interpret/allocation.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ impl<Tag> Allocation<Tag> {
113113
}
114114
}
115115

116-
impl<'tcx> ::serialize::UseSpecializedDecodable for &'tcx Allocation {}
116+
impl<'tcx> rustc_serialize::UseSpecializedDecodable for &'tcx Allocation {}
117117

118118
/// Byte accessors
119119
impl<'tcx, Tag: Copy, Extra: AllocationExtra<Tag>> Allocation<Tag, Extra> {

Diff for: ‎src/librustc/mir/interpret/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use crate::hir::def_id::DefId;
2727
use crate::ty::{self, TyCtxt, Instance, subst::UnpackedKind};
2828
use crate::ty::layout::{self, Size};
2929
use std::io;
30-
use crate::rustc_serialize::{Encoder, Decodable, Encodable};
30+
use rustc_serialize::{Encoder, Decodable, Encodable};
3131
use rustc_data_structures::fx::FxHashMap;
3232
use rustc_data_structures::sync::{Lock as Mutex, HashMapExt};
3333
use rustc_data_structures::tiny_list::TinyList;
@@ -51,8 +51,8 @@ pub struct GlobalId<'tcx> {
5151
#[derive(Copy, Clone, Eq, Hash, Ord, PartialEq, PartialOrd, Debug)]
5252
pub struct AllocId(pub u64);
5353

54-
impl crate::rustc_serialize::UseSpecializedEncodable for AllocId {}
55-
impl crate::rustc_serialize::UseSpecializedDecodable for AllocId {}
54+
impl rustc_serialize::UseSpecializedEncodable for AllocId {}
55+
impl rustc_serialize::UseSpecializedDecodable for AllocId {}
5656

5757
#[derive(RustcDecodable, RustcEncodable)]
5858
enum AllocDiscriminant {

Diff for: ‎src/librustc/mir/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use crate::hir::def_id::DefId;
99
use crate::hir::{self, InlineAsm as HirInlineAsm};
1010
use crate::mir::interpret::{ConstValue, PanicMessage, Scalar};
1111
use crate::mir::visit::MirVisitable;
12-
use crate::rustc_serialize as serialize;
1312
use crate::ty::adjustment::PointerCast;
1413
use crate::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
1514
use crate::ty::layout::VariantIdx;
@@ -28,6 +27,7 @@ use rustc_data_structures::indexed_vec::{Idx, IndexVec};
2827
use rustc_data_structures::sync::Lrc;
2928
use rustc_data_structures::sync::MappedReadGuard;
3029
use rustc_macros::HashStable;
30+
use rustc_serialize::{Encodable, Decodable};
3131
use smallvec::SmallVec;
3232
use std::borrow::Cow;
3333
use std::fmt::{self, Debug, Display, Formatter, Write};
@@ -463,8 +463,8 @@ impl<T> ClearCrossCrate<T> {
463463
}
464464
}
465465

466-
impl<T: serialize::Encodable> serialize::UseSpecializedEncodable for ClearCrossCrate<T> {}
467-
impl<T: serialize::Decodable> serialize::UseSpecializedDecodable for ClearCrossCrate<T> {}
466+
impl<T: Encodable> rustc_serialize::UseSpecializedEncodable for ClearCrossCrate<T> {}
467+
impl<T: Decodable> rustc_serialize::UseSpecializedDecodable for ClearCrossCrate<T> {}
468468

469469
/// Grouped information about the source code origin of a MIR entity.
470470
/// Intended to be inspected by diagnostics and debuginfo.

Diff for: ‎src/librustc/session/config.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1468,6 +1468,8 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
14681468
symbol_mangling_version: SymbolManglingVersion = (SymbolManglingVersion::Legacy,
14691469
parse_symbol_mangling_version, [TRACKED],
14701470
"which mangling version to use for symbol names"),
1471+
binary_dep_depinfo: bool = (false, parse_bool, [TRACKED],
1472+
"include artifacts (sysroot, crate dependencies) used during compilation in dep-info"),
14711473
}
14721474

14731475
pub fn default_lib_output() -> CrateType {

Diff for: ‎src/librustc/session/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,9 @@ impl Session {
545545
pub fn print_llvm_passes(&self) -> bool {
546546
self.opts.debugging_opts.print_llvm_passes
547547
}
548+
pub fn binary_dep_depinfo(&self) -> bool {
549+
self.opts.debugging_opts.binary_dep_depinfo
550+
}
548551

549552
/// Gets the features enabled for the current compilation session.
550553
/// DO NOT USE THIS METHOD if there is a TyCtxt available, as it circumvents

Diff for: ‎src/librustc/ty/codec.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::arena::ArenaAllocatable;
1010
use crate::hir::def_id::{DefId, CrateNum};
1111
use crate::infer::canonical::{CanonicalVarInfo, CanonicalVarInfos};
1212
use rustc_data_structures::fx::FxHashMap;
13-
use crate::rustc_serialize::{Decodable, Decoder, Encoder, Encodable, opaque};
13+
use rustc_serialize::{Decodable, Decoder, Encoder, Encodable, opaque};
1414
use std::hash::Hash;
1515
use std::intrinsics;
1616
use crate::ty::{self, Ty, TyCtxt};
@@ -333,7 +333,7 @@ macro_rules! implement_ty_decoder {
333333
use $crate::ty::codec::*;
334334
use $crate::ty::subst::SubstsRef;
335335
use $crate::hir::def_id::{CrateNum};
336-
use crate::rustc_serialize::{Decoder, SpecializedDecoder};
336+
use rustc_serialize::{Decoder, SpecializedDecoder};
337337
use std::borrow::Cow;
338338

339339
impl<$($typaram ),*> Decoder for $DecoderName<$($typaram),*> {

Diff for: ‎src/librustc/ty/mod.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use crate::util::nodemap::{NodeSet, DefIdMap, FxHashMap};
3232
use arena::SyncDroplessArena;
3333
use crate::session::DataTypeKind;
3434

35-
use serialize::{self, Encodable, Encoder};
35+
use rustc_serialize::{self, Encodable, Encoder};
3636
use std::cell::RefCell;
3737
use std::cmp::{self, Ordering};
3838
use std::fmt;
@@ -588,8 +588,8 @@ impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for ty::TyS<'tcx> {
588588

589589
pub type Ty<'tcx> = &'tcx TyS<'tcx>;
590590

591-
impl<'tcx> serialize::UseSpecializedEncodable for Ty<'tcx> {}
592-
impl<'tcx> serialize::UseSpecializedDecodable for Ty<'tcx> {}
591+
impl<'tcx> rustc_serialize::UseSpecializedEncodable for Ty<'tcx> {}
592+
impl<'tcx> rustc_serialize::UseSpecializedDecodable for Ty<'tcx> {}
593593

594594
pub type CanonicalTy<'tcx> = Canonical<'tcx, Ty<'tcx>>;
595595

@@ -708,7 +708,7 @@ impl<'a, T> IntoIterator for &'a List<T> {
708708
}
709709
}
710710

711-
impl<'tcx> serialize::UseSpecializedDecodable for &'tcx List<Ty<'tcx>> {}
711+
impl<'tcx> rustc_serialize::UseSpecializedDecodable for &'tcx List<Ty<'tcx>> {}
712712

713713
impl<T> List<T> {
714714
#[inline(always)]
@@ -1009,8 +1009,8 @@ pub struct GenericPredicates<'tcx> {
10091009
pub predicates: Vec<(Predicate<'tcx>, Span)>,
10101010
}
10111011

1012-
impl<'tcx> serialize::UseSpecializedEncodable for GenericPredicates<'tcx> {}
1013-
impl<'tcx> serialize::UseSpecializedDecodable for GenericPredicates<'tcx> {}
1012+
impl<'tcx> rustc_serialize::UseSpecializedEncodable for GenericPredicates<'tcx> {}
1013+
impl<'tcx> rustc_serialize::UseSpecializedDecodable for GenericPredicates<'tcx> {}
10141014

10151015
impl<'tcx> GenericPredicates<'tcx> {
10161016
pub fn instantiate(
@@ -1985,13 +1985,13 @@ impl Hash for AdtDef {
19851985
}
19861986
}
19871987

1988-
impl<'tcx> serialize::UseSpecializedEncodable for &'tcx AdtDef {
1988+
impl<'tcx> rustc_serialize::UseSpecializedEncodable for &'tcx AdtDef {
19891989
fn default_encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
19901990
self.did.encode(s)
19911991
}
19921992
}
19931993

1994-
impl<'tcx> serialize::UseSpecializedDecodable for &'tcx AdtDef {}
1994+
impl<'tcx> rustc_serialize::UseSpecializedDecodable for &'tcx AdtDef {}
19951995

19961996

19971997
impl<'a> HashStable<StableHashingContext<'a>> for AdtDef {

Diff for: ‎src/librustc/ty/query/on_disk_cache.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::hir::map::definitions::DefPathHash;
55
use crate::ich::{CachingSourceMapView, Fingerprint};
66
use crate::mir::{self, interpret};
77
use crate::mir::interpret::{AllocDecodingSession, AllocDecodingState};
8-
use crate::rustc_serialize::{Decodable, Decoder, Encodable, Encoder, opaque,
8+
use rustc_serialize::{Decodable, Decoder, Encodable, Encoder, opaque,
99
SpecializedDecoder, SpecializedEncoder,
1010
UseSpecializedDecodable, UseSpecializedEncodable};
1111
use crate::session::{CrateDisambiguator, Session};

0 commit comments

Comments
 (0)