Skip to content

Commit b12b063

Browse files
eddybeddyb
committed
serialize: rename to rustc_serialize.
1 parent b68fc18 commit b12b063

Some content is hidden

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

80 files changed

+180
-188
lines changed

‎Cargo.lock

+18-18
Original file line numberDiff line numberDiff line change
@@ -1940,9 +1940,9 @@ dependencies = [
19401940
"rustc_data_structures 0.0.0",
19411941
"rustc_errors 0.0.0",
19421942
"rustc_fs_util 0.0.0",
1943+
"rustc_serialize 0.0.0",
19431944
"rustc_target 0.0.0",
19441945
"scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
1945-
"serialize 0.0.0",
19461946
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
19471947
"syntax 0.0.0",
19481948
"syntax_pos 0.0.0",
@@ -2194,8 +2194,8 @@ dependencies = [
21942194
"rustc_fs_util 0.0.0",
21952195
"rustc_incremental 0.0.0",
21962196
"rustc_mir 0.0.0",
2197+
"rustc_serialize 0.0.0",
21972198
"rustc_target 0.0.0",
2198-
"serialize 0.0.0",
21992199
"syntax 0.0.0",
22002200
"syntax_pos 0.0.0",
22012201
]
@@ -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-
"serialize 0.0.0",
2241+
"rustc_serialize 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
]
@@ -2268,11 +2268,11 @@ dependencies = [
22682268
"rustc_privacy 0.0.0",
22692269
"rustc_resolve 0.0.0",
22702270
"rustc_save_analysis 0.0.0",
2271+
"rustc_serialize 0.0.0",
22712272
"rustc_target 0.0.0",
22722273
"rustc_traits 0.0.0",
22732274
"rustc_typeck 0.0.0",
22742275
"scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2275-
"serialize 0.0.0",
22762276
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
22772277
"syntax 0.0.0",
22782278
"syntax_ext 0.0.0",
@@ -2287,7 +2287,7 @@ 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-
"serialize 0.0.0",
2290+
"rustc_serialize 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)",
@@ -2307,7 +2307,7 @@ dependencies = [
23072307
"rustc 0.0.0",
23082308
"rustc_data_structures 0.0.0",
23092309
"rustc_fs_util 0.0.0",
2310-
"serialize 0.0.0",
2310+
"rustc_serialize 0.0.0",
23112311
"syntax 0.0.0",
23122312
"syntax_pos 0.0.0",
23132313
]
@@ -2355,8 +2355,8 @@ dependencies = [
23552355
"rustc 0.0.0",
23562356
"rustc_data_structures 0.0.0",
23572357
"rustc_errors 0.0.0",
2358+
"rustc_serialize 0.0.0",
23582359
"rustc_target 0.0.0",
2359-
"serialize 0.0.0",
23602360
"stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
23612361
"syntax 0.0.0",
23622362
"syntax_ext 0.0.0",
@@ -2379,8 +2379,8 @@ dependencies = [
23792379
"rustc_apfloat 0.0.0",
23802380
"rustc_data_structures 0.0.0",
23812381
"rustc_errors 0.0.0",
2382+
"rustc_serialize 0.0.0",
23822383
"rustc_target 0.0.0",
2383-
"serialize 0.0.0",
23842384
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
23852385
"syntax 0.0.0",
23862386
"syntax_pos 0.0.0",
@@ -2468,6 +2468,13 @@ dependencies = [
24682468
"syntax_pos 0.0.0",
24692469
]
24702470

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+
24712478
[[package]]
24722479
name = "rustc_target"
24732480
version = "0.0.0"
@@ -2476,7 +2483,7 @@ dependencies = [
24762483
"log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
24772484
"rustc_cratesio_shim 0.0.0",
24782485
"rustc_data_structures 0.0.0",
2479-
"serialize 0.0.0",
2486+
"rustc_serialize 0.0.0",
24802487
]
24812488

24822489
[[package]]
@@ -2686,13 +2693,6 @@ dependencies = [
26862693
"serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
26872694
]
26882695

2689-
[[package]]
2690-
name = "serialize"
2691-
version = "0.0.0"
2692-
dependencies = [
2693-
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
2694-
]
2695-
26962696
[[package]]
26972697
name = "shell-escape"
26982698
version = "0.1.4"
@@ -2877,9 +2877,9 @@ 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",
28802881
"rustc_target 0.0.0",
28812882
"scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2882-
"serialize 0.0.0",
28832883
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
28842884
"syntax_pos 0.0.0",
28852885
]
@@ -2906,8 +2906,8 @@ 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",
29092910
"scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
2910-
"serialize 0.0.0",
29112911
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
29122912
]
29132913

‎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-
serialize = { path = "../libserialize" }
28+
rustc_serialize = { path = "../librustc_serialize" }
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 serialize;
14+
use rustc_serialize;
1515
use std::fmt;
1616
use std::u32;
1717

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

110-
impl serialize::UseSpecializedEncodable for CrateNum {}
111-
impl serialize::UseSpecializedDecodable for CrateNum {}
110+
impl rustc_serialize::UseSpecializedEncodable for CrateNum {}
111+
impl rustc_serialize::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 serialize::UseSpecializedEncodable for DefIndex {}
203-
impl serialize::UseSpecializedDecodable for DefIndex {}
202+
impl rustc_serialize::UseSpecializedEncodable for DefIndex {}
203+
impl rustc_serialize::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 serialize::UseSpecializedEncodable for DefId {}
263-
impl serialize::UseSpecializedDecodable for DefId {}
262+
impl rustc_serialize::UseSpecializedEncodable for DefId {}
263+
impl rustc_serialize::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 serialize::UseSpecializedEncodable for LocalDefId {}
297-
impl serialize::UseSpecializedDecodable for LocalDefId {}
296+
impl rustc_serialize::UseSpecializedEncodable for LocalDefId {}
297+
impl rustc_serialize::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 serialize::{Encodable, Decodable, Encoder, Decoder};
24+
use rustc_serialize::{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 serialize::{self, Encoder, Encodable, Decoder, Decodable};
43+
use rustc_serialize::{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 serialize::UseSpecializedEncodable for HirId {
98+
impl rustc_serialize::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 serialize::UseSpecializedEncodable for HirId {
107107
}
108108
}
109109

110-
impl serialize::UseSpecializedDecodable for HirId {
110+
impl rustc_serialize::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 serialize::UseSpecializedDecodable;
37+
use rustc_serialize::UseSpecializedDecodable;
3838
use smallvec::SmallVec;
3939
use std::ops::Index;
4040
use syntax::source_map::Span;

‎src/librustc/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ extern crate libc;
8888
extern crate polonius_engine;
8989
extern crate rustc_target;
9090
#[macro_use] extern crate rustc_data_structures;
91-
extern crate serialize;
9291
extern crate parking_lot;
9392
extern crate rustc_errors as errors;
9493
extern crate rustc_rayon as rayon;
@@ -101,7 +100,7 @@ extern crate proc_macro;
101100
extern crate chalk_engine;
102101
extern crate rustc_fs_util;
103102

104-
extern crate serialize as rustc_serialize; // used by deriving
103+
extern crate rustc_serialize; // used by deriving
105104

106105
extern crate rustc_apfloat;
107106
extern crate byteorder;

‎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 as serialize;
18+
use rustc_serialize;
1919

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

2525

26-
impl serialize::Encodable for Cache {
27-
fn encode<S: serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
28-
serialize::Encodable::encode(&(), s)
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)
2929
}
3030
}
3131

32-
impl serialize::Decodable for Cache {
33-
fn decode<D: serialize::Decoder>(d: &mut D) -> Result<Self, D::Error> {
34-
serialize::Decodable::decode(d).map(|_v: ()| Self::new())
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())
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> ::serialize::UseSpecializedDecodable for &'tcx Allocation {}
142+
impl<'tcx> ::rustc_serialize::UseSpecializedDecodable for &'tcx Allocation {}
143143

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

‎src/librustc/mir/mod.rs

+5-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 as serialize;
28+
use rustc_serialize;
2929
use smallvec::SmallVec;
3030
use std::borrow::Cow;
3131
use std::fmt::{self, Debug, Formatter, Write};
@@ -456,8 +456,10 @@ impl<T> ClearCrossCrate<T> {
456456
}
457457
}
458458

459-
impl<T: serialize::Encodable> serialize::UseSpecializedEncodable for ClearCrossCrate<T> {}
460-
impl<T: serialize::Decodable> serialize::UseSpecializedDecodable for ClearCrossCrate<T> {}
459+
impl<T: rustc_serialize::Encodable> rustc_serialize::UseSpecializedEncodable
460+
for ClearCrossCrate<T> {}
461+
impl<T: rustc_serialize::Decodable> rustc_serialize::UseSpecializedDecodable
462+
for ClearCrossCrate<T> {}
461463

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

‎src/librustc/ty/mod.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use util::nodemap::{NodeSet, DefIdMap, FxHashMap};
4141
use arena::SyncDroplessArena;
4242
use session::DataTypeKind;
4343

44-
use serialize::{self, Encodable, Encoder};
44+
use rustc_serialize::{self, Encodable, Encoder};
4545
use std::cell::RefCell;
4646
use std::cmp::{self, Ordering};
4747
use std::fmt;
@@ -598,8 +598,8 @@ impl<'a, 'gcx> HashStable<StableHashingContext<'a>> for ty::TyS<'gcx> {
598598

599599
pub type Ty<'tcx> = &'tcx TyS<'tcx>;
600600

601-
impl<'tcx> serialize::UseSpecializedEncodable for Ty<'tcx> {}
602-
impl<'tcx> serialize::UseSpecializedDecodable for Ty<'tcx> {}
601+
impl<'tcx> rustc_serialize::UseSpecializedEncodable for Ty<'tcx> {}
602+
impl<'tcx> rustc_serialize::UseSpecializedDecodable for Ty<'tcx> {}
603603

604604
pub type CanonicalTy<'gcx> = Canonical<'gcx, Ty<'gcx>>;
605605

@@ -718,7 +718,7 @@ impl<'a, T> IntoIterator for &'a List<T> {
718718
}
719719
}
720720

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

723723
impl<T> List<T> {
724724
#[inline(always)]
@@ -995,8 +995,8 @@ pub struct GenericPredicates<'tcx> {
995995
pub predicates: Vec<(Predicate<'tcx>, Span)>,
996996
}
997997

998-
impl<'tcx> serialize::UseSpecializedEncodable for GenericPredicates<'tcx> {}
999-
impl<'tcx> serialize::UseSpecializedDecodable for GenericPredicates<'tcx> {}
998+
impl<'tcx> rustc_serialize::UseSpecializedEncodable for GenericPredicates<'tcx> {}
999+
impl<'tcx> rustc_serialize::UseSpecializedDecodable for GenericPredicates<'tcx> {}
10001000

10011001
impl<'a, 'gcx, 'tcx> GenericPredicates<'tcx> {
10021002
pub fn instantiate(&self, tcx: TyCtxt<'a, 'gcx, 'tcx>, substs: &Substs<'tcx>)
@@ -1901,13 +1901,13 @@ impl Hash for AdtDef {
19011901
}
19021902
}
19031903

1904-
impl<'tcx> serialize::UseSpecializedEncodable for &'tcx AdtDef {
1904+
impl<'tcx> rustc_serialize::UseSpecializedEncodable for &'tcx AdtDef {
19051905
fn default_encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
19061906
self.did.encode(s)
19071907
}
19081908
}
19091909

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

19121912

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

0 commit comments

Comments
 (0)