Skip to content

Commit 700602b

Browse files
eddybeddyb
committed
HACK(eddyb) rename rustc_serialize to rustc_ezilaires.
1 parent b12b063 commit 700602b

File tree

96 files changed

+203
-203
lines changed

Some content is hidden

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

96 files changed

+203
-203
lines changed

‎Cargo.lock

+18-18
Original file line numberDiff line numberDiff line change
@@ -1939,8 +1939,8 @@ dependencies = [
19391939
"rustc_apfloat 0.0.0",
19401940
"rustc_data_structures 0.0.0",
19411941
"rustc_errors 0.0.0",
1942+
"rustc_ezilaires 0.0.0",
19421943
"rustc_fs_util 0.0.0",
1943-
"rustc_serialize 0.0.0",
19441944
"rustc_target 0.0.0",
19451945
"scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
19461946
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2191,10 +2191,10 @@ dependencies = [
21912191
"rustc_codegen_utils 0.0.0",
21922192
"rustc_data_structures 0.0.0",
21932193
"rustc_errors 0.0.0",
2194+
"rustc_ezilaires 0.0.0",
21942195
"rustc_fs_util 0.0.0",
21952196
"rustc_incremental 0.0.0",
21962197
"rustc_mir 0.0.0",
2197-
"rustc_serialize 0.0.0",
21982198
"rustc_target 0.0.0",
21992199
"syntax 0.0.0",
22002200
"syntax_pos 0.0.0",
@@ -2238,7 +2238,7 @@ dependencies = [
22382238
"rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
22392239
"rustc-rayon-core 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
22402240
"rustc_cratesio_shim 0.0.0",
2241-
"rustc_serialize 0.0.0",
2241+
"rustc_ezilaires 0.0.0",
22422242
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
22432243
"stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
22442244
]
@@ -2259,6 +2259,7 @@ dependencies = [
22592259
"rustc_codegen_utils 0.0.0",
22602260
"rustc_data_structures 0.0.0",
22612261
"rustc_errors 0.0.0",
2262+
"rustc_ezilaires 0.0.0",
22622263
"rustc_incremental 0.0.0",
22632264
"rustc_lint 0.0.0",
22642265
"rustc_metadata 0.0.0",
@@ -2268,7 +2269,6 @@ dependencies = [
22682269
"rustc_privacy 0.0.0",
22692270
"rustc_resolve 0.0.0",
22702271
"rustc_save_analysis 0.0.0",
2271-
"rustc_serialize 0.0.0",
22722272
"rustc_target 0.0.0",
22732273
"rustc_traits 0.0.0",
22742274
"rustc_typeck 0.0.0",
@@ -2287,12 +2287,19 @@ dependencies = [
22872287
"log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
22882288
"rustc_cratesio_shim 0.0.0",
22892289
"rustc_data_structures 0.0.0",
2290-
"rustc_serialize 0.0.0",
2290+
"rustc_ezilaires 0.0.0",
22912291
"syntax_pos 0.0.0",
22922292
"termcolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
22932293
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
22942294
]
22952295

2296+
[[package]]
2297+
name = "rustc_ezilaires"
2298+
version = "0.0.0"
2299+
dependencies = [
2300+
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
2301+
]
2302+
22962303
[[package]]
22972304
name = "rustc_fs_util"
22982305
version = "0.0.0"
@@ -2306,8 +2313,8 @@ dependencies = [
23062313
"rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
23072314
"rustc 0.0.0",
23082315
"rustc_data_structures 0.0.0",
2316+
"rustc_ezilaires 0.0.0",
23092317
"rustc_fs_util 0.0.0",
2310-
"rustc_serialize 0.0.0",
23112318
"syntax 0.0.0",
23122319
"syntax_pos 0.0.0",
23132320
]
@@ -2355,7 +2362,7 @@ dependencies = [
23552362
"rustc 0.0.0",
23562363
"rustc_data_structures 0.0.0",
23572364
"rustc_errors 0.0.0",
2358-
"rustc_serialize 0.0.0",
2365+
"rustc_ezilaires 0.0.0",
23592366
"rustc_target 0.0.0",
23602367
"stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
23612368
"syntax 0.0.0",
@@ -2379,7 +2386,7 @@ dependencies = [
23792386
"rustc_apfloat 0.0.0",
23802387
"rustc_data_structures 0.0.0",
23812388
"rustc_errors 0.0.0",
2382-
"rustc_serialize 0.0.0",
2389+
"rustc_ezilaires 0.0.0",
23832390
"rustc_target 0.0.0",
23842391
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
23852392
"syntax 0.0.0",
@@ -2468,13 +2475,6 @@ dependencies = [
24682475
"syntax_pos 0.0.0",
24692476
]
24702477

2471-
[[package]]
2472-
name = "rustc_serialize"
2473-
version = "0.0.0"
2474-
dependencies = [
2475-
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
2476-
]
2477-
24782478
[[package]]
24792479
name = "rustc_target"
24802480
version = "0.0.0"
@@ -2483,7 +2483,7 @@ dependencies = [
24832483
"log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
24842484
"rustc_cratesio_shim 0.0.0",
24852485
"rustc_data_structures 0.0.0",
2486-
"rustc_serialize 0.0.0",
2486+
"rustc_ezilaires 0.0.0",
24872487
]
24882488

24892489
[[package]]
@@ -2877,7 +2877,7 @@ dependencies = [
28772877
"log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
28782878
"rustc_data_structures 0.0.0",
28792879
"rustc_errors 0.0.0",
2880-
"rustc_serialize 0.0.0",
2880+
"rustc_ezilaires 0.0.0",
28812881
"rustc_target 0.0.0",
28822882
"scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
28832883
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2906,7 +2906,7 @@ dependencies = [
29062906
"arena 0.0.0",
29072907
"cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
29082908
"rustc_data_structures 0.0.0",
2909-
"rustc_serialize 0.0.0",
2909+
"rustc_ezilaires 0.0.0",
29102910
"scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
29112911
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
29122912
]

‎src/librustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ rustc_apfloat = { path = "../librustc_apfloat" }
2525
rustc_target = { path = "../librustc_target" }
2626
rustc_data_structures = { path = "../librustc_data_structures" }
2727
rustc_errors = { path = "../librustc_errors" }
28-
rustc_serialize = { path = "../librustc_serialize" }
28+
rustc_ezilaires = { path = "../librustc_ezilaires" }
2929
syntax = { path = "../libsyntax" }
3030
syntax_pos = { path = "../libsyntax_pos" }
3131
backtrace = "0.3.3"

‎src/librustc/hir/def_id.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use ty;
1212
use hir::map::definitions::FIRST_FREE_HIGH_DEF_INDEX;
1313
use rustc_data_structures::indexed_vec::Idx;
14-
use rustc_serialize;
14+
use rustc_ezilaires;
1515
use std::fmt;
1616
use std::u32;
1717

@@ -107,8 +107,8 @@ impl fmt::Display for CrateNum {
107107
}
108108
}
109109

110-
impl rustc_serialize::UseSpecializedEncodable for CrateNum {}
111-
impl rustc_serialize::UseSpecializedDecodable for CrateNum {}
110+
impl rustc_ezilaires::UseSpecializedEncodable for CrateNum {}
111+
impl rustc_ezilaires::UseSpecializedDecodable for CrateNum {}
112112

113113
/// A DefIndex is an index into the hir-map for a crate, identifying a
114114
/// particular definition. It should really be considered an interned
@@ -199,8 +199,8 @@ impl DefIndex {
199199
}
200200
}
201201

202-
impl rustc_serialize::UseSpecializedEncodable for DefIndex {}
203-
impl rustc_serialize::UseSpecializedDecodable for DefIndex {}
202+
impl rustc_ezilaires::UseSpecializedEncodable for DefIndex {}
203+
impl rustc_ezilaires::UseSpecializedDecodable for DefIndex {}
204204

205205
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
206206
pub enum DefIndexAddressSpace {
@@ -259,8 +259,8 @@ impl DefId {
259259
}
260260
}
261261

262-
impl rustc_serialize::UseSpecializedEncodable for DefId {}
263-
impl rustc_serialize::UseSpecializedDecodable for DefId {}
262+
impl rustc_ezilaires::UseSpecializedEncodable for DefId {}
263+
impl rustc_ezilaires::UseSpecializedDecodable for DefId {}
264264

265265
/// A LocalDefId is equivalent to a DefId with `krate == LOCAL_CRATE`. Since
266266
/// we encode this information in the type, we can ensure at compile time that
@@ -293,5 +293,5 @@ impl fmt::Debug for LocalDefId {
293293
}
294294
}
295295

296-
impl rustc_serialize::UseSpecializedEncodable for LocalDefId {}
297-
impl rustc_serialize::UseSpecializedDecodable for LocalDefId {}
296+
impl rustc_ezilaires::UseSpecializedEncodable for LocalDefId {}
297+
impl rustc_ezilaires::UseSpecializedDecodable for LocalDefId {}

‎src/librustc/hir/map/definitions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use ich::Fingerprint;
2121
use rustc_data_structures::fx::FxHashMap;
2222
use rustc_data_structures::indexed_vec::{IndexVec};
2323
use rustc_data_structures::stable_hasher::StableHasher;
24-
use rustc_serialize::{Encodable, Decodable, Encoder, Decoder};
24+
use rustc_ezilaires::{Encodable, Decodable, Encoder, Decoder};
2525
use session::CrateDisambiguator;
2626
use std::borrow::Borrow;
2727
use std::fmt::Write;

‎src/librustc/hir/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use ty::query::Providers;
4040
use rustc_data_structures::sync::{ParallelIterator, par_iter, Send, Sync, scope};
4141
use rustc_data_structures::thin_vec::ThinVec;
4242

43-
use rustc_serialize::{self, Encoder, Encodable, Decoder, Decodable};
43+
use rustc_ezilaires::{self, Encoder, Encodable, Decoder, Decodable};
4444
use std::collections::BTreeMap;
4545
use std::fmt;
4646

@@ -95,7 +95,7 @@ impl HirId {
9595
}
9696
}
9797

98-
impl rustc_serialize::UseSpecializedEncodable for HirId {
98+
impl rustc_ezilaires::UseSpecializedEncodable for HirId {
9999
fn default_encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
100100
let HirId {
101101
owner,
@@ -107,7 +107,7 @@ impl rustc_serialize::UseSpecializedEncodable for HirId {
107107
}
108108
}
109109

110-
impl rustc_serialize::UseSpecializedDecodable for HirId {
110+
impl rustc_ezilaires::UseSpecializedDecodable for HirId {
111111
fn default_decode<D: Decoder>(d: &mut D) -> Result<HirId, D::Error> {
112112
let owner = DefIndex::decode(d)?;
113113
let local_id = ItemLocalId::decode(d)?;

‎src/librustc/infer/canonical/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
use infer::{InferCtxt, RegionVariableOrigin, TypeVariableOrigin};
3535
use rustc_data_structures::indexed_vec::IndexVec;
3636
use rustc_data_structures::sync::Lrc;
37-
use rustc_serialize::UseSpecializedDecodable;
37+
use rustc_ezilaires::UseSpecializedDecodable;
3838
use smallvec::SmallVec;
3939
use std::ops::Index;
4040
use syntax::source_map::Span;

‎src/librustc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ extern crate proc_macro;
100100
extern crate chalk_engine;
101101
extern crate rustc_fs_util;
102102

103-
extern crate rustc_serialize; // used by deriving
103+
extern crate rustc_ezilaires; use rustc_ezilaires as rustc_serialize; // used by deriving
104104

105105
extern crate rustc_apfloat;
106106
extern crate byteorder;

‎src/librustc/lint/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use lint::{Level, Lint, LintId, LintPass, LintBuffer};
3333
use lint::builtin::BuiltinLintDiagnostics;
3434
use lint::levels::{LintLevelSets, LintLevelsBuilder};
3535
use middle::privacy::AccessLevels;
36-
use rustc_serialize::{Decoder, Decodable, Encoder, Encodable};
36+
use rustc_ezilaires::{Decoder, Decodable, Encoder, Encodable};
3737
use session::{config, early_error, Session};
3838
use ty::{self, TyCtxt, Ty};
3939
use ty::layout::{LayoutError, LayoutOf, TyLayout};

‎src/librustc/mir/cache.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ use rustc_data_structures::stable_hasher::{HashStable, StableHasher,
1515
use ich::StableHashingContext;
1616
use mir::{Mir, BasicBlock};
1717

18-
use rustc_serialize;
18+
use rustc_ezilaires;
1919

2020
#[derive(Clone, Debug)]
2121
pub struct Cache {
2222
predecessors: RwLock<Option<IndexVec<BasicBlock, Vec<BasicBlock>>>>
2323
}
2424

2525

26-
impl rustc_serialize::Encodable for Cache {
27-
fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
28-
rustc_serialize::Encodable::encode(&(), s)
26+
impl rustc_ezilaires::Encodable for Cache {
27+
fn encode<S: rustc_ezilaires::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
28+
rustc_ezilaires::Encodable::encode(&(), s)
2929
}
3030
}
3131

32-
impl rustc_serialize::Decodable for Cache {
33-
fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<Self, D::Error> {
34-
rustc_serialize::Decodable::decode(d).map(|_v: ()| Self::new())
32+
impl rustc_ezilaires::Decodable for Cache {
33+
fn decode<D: rustc_ezilaires::Decoder>(d: &mut D) -> Result<Self, D::Error> {
34+
rustc_ezilaires::Decodable::decode(d).map(|_v: ()| Self::new())
3535
}
3636
}
3737

‎src/librustc/mir/interpret/allocation.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ impl<Tag, Extra> Allocation<Tag, Extra> {
139139
}
140140
}
141141

142-
impl<'tcx> ::rustc_serialize::UseSpecializedDecodable for &'tcx Allocation {}
142+
impl<'tcx> ::rustc_ezilaires::UseSpecializedDecodable for &'tcx Allocation {}
143143

144144
/// Alignment and bounds checks
145145
impl<'tcx, Tag, Extra> Allocation<Tag, Extra> {

‎src/librustc/mir/interpret/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ use ty::layout::{self, Size};
4242
use middle::region;
4343
use std::io;
4444
use std::hash::Hash;
45-
use rustc_serialize::{Encoder, Decodable, Encodable};
45+
use rustc_ezilaires::{Encoder, Decodable, Encodable};
4646
use rustc_data_structures::fx::FxHashMap;
4747
use rustc_data_structures::sync::{Lock as Mutex, HashMapExt};
4848
use rustc_data_structures::tiny_list::TinyList;
@@ -86,8 +86,8 @@ pub struct GlobalId<'tcx> {
8686
#[derive(Copy, Clone, Eq, Hash, Ord, PartialEq, PartialOrd, Debug)]
8787
pub struct AllocId(pub u64);
8888

89-
impl ::rustc_serialize::UseSpecializedEncodable for AllocId {}
90-
impl ::rustc_serialize::UseSpecializedDecodable for AllocId {}
89+
impl ::rustc_ezilaires::UseSpecializedEncodable for AllocId {}
90+
impl ::rustc_ezilaires::UseSpecializedDecodable for AllocId {}
9191

9292
#[derive(RustcDecodable, RustcEncodable)]
9393
enum AllocKind {

‎src/librustc/mir/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use rustc_data_structures::graph::{self, GraphPredecessors, GraphSuccessors};
2525
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
2626
use rustc_data_structures::sync::Lrc;
2727
use rustc_data_structures::sync::MappedReadGuard;
28-
use rustc_serialize;
28+
use rustc_ezilaires;
2929
use smallvec::SmallVec;
3030
use std::borrow::Cow;
3131
use std::fmt::{self, Debug, Formatter, Write};
@@ -456,9 +456,9 @@ impl<T> ClearCrossCrate<T> {
456456
}
457457
}
458458

459-
impl<T: rustc_serialize::Encodable> rustc_serialize::UseSpecializedEncodable
459+
impl<T: rustc_ezilaires::Encodable> rustc_ezilaires::UseSpecializedEncodable
460460
for ClearCrossCrate<T> {}
461-
impl<T: rustc_serialize::Decodable> rustc_serialize::UseSpecializedDecodable
461+
impl<T: rustc_ezilaires::Decodable> rustc_ezilaires::UseSpecializedDecodable
462462
for ClearCrossCrate<T> {}
463463

464464
/// Grouped information about the source code origin of a MIR entity.

‎src/librustc/ty/codec.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use hir::def_id::{DefId, CrateNum};
2020
use infer::canonical::{CanonicalVarInfo, CanonicalVarInfos};
2121
use rustc_data_structures::fx::FxHashMap;
22-
use rustc_serialize::{Decodable, Decoder, Encoder, Encodable, opaque};
22+
use rustc_ezilaires::{Decodable, Decoder, Encoder, Encodable, opaque};
2323
use std::hash::Hash;
2424
use std::intrinsics;
2525
use ty::{self, Ty, TyCtxt};
@@ -293,7 +293,7 @@ macro_rules! implement_ty_decoder {
293293
use $crate::ty::codec::*;
294294
use $crate::ty::subst::Substs;
295295
use $crate::hir::def_id::{CrateNum};
296-
use rustc_serialize::{Decoder, SpecializedDecoder};
296+
use rustc_ezilaires::{Decoder, SpecializedDecoder};
297297
use std::borrow::Cow;
298298

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

0 commit comments

Comments
 (0)