Skip to content

Commit e2320b3

Browse files
committed
Convert rustc_serialize integration tests to unit tests.
Because (a) the vast majority of compiler tests are unit tests, and (b) this works better with `unused_crate_dependencies`.
1 parent 8121958 commit e2320b3

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

compiler/rustc_serialize/src/leb128.rs

+3
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,6 @@ impl_read_signed_leb128!(read_i32_leb128, i32);
155155
impl_read_signed_leb128!(read_i64_leb128, i64);
156156
impl_read_signed_leb128!(read_i128_leb128, i128);
157157
impl_read_signed_leb128!(read_isize_leb128, isize);
158+
159+
#[cfg(test)]
160+
mod tests;

compiler/rustc_serialize/tests/leb128.rs compiler/rustc_serialize/src/leb128/tests.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
// FIXME
2-
#![allow(unused_crate_dependencies)]
3-
4-
use rustc_serialize::Decoder;
5-
use rustc_serialize::leb128::*;
6-
use rustc_serialize::opaque::{MAGIC_END_BYTES, MemDecoder};
1+
use super::*;
2+
use crate::Decoder;
3+
use crate::opaque::{MAGIC_END_BYTES, MemDecoder};
74

85
macro_rules! impl_test_unsigned_leb128 {
96
($test_name:ident, $write_fn_name:ident, $read_fn_name:ident, $int_ty:ident) => {

compiler/rustc_serialize/src/lib.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// tidy-alphabetical-start
44
#![allow(internal_features)]
55
#![allow(rustc::internal)]
6-
// FIXME
7-
#![allow(unused_crate_dependencies)]
86
#![cfg_attr(test, feature(test))]
97
#![doc(
108
html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
@@ -18,6 +16,10 @@
1816
#![feature(rustdoc_internals)]
1917
// tidy-alphabetical-end
2018

19+
// Allows macros to refer to this crate as `::rustc_serialize`.
20+
#[cfg(test)]
21+
extern crate self as rustc_serialize;
22+
2123
pub use self::serialize::{Decodable, Decoder, Encodable, Encoder};
2224

2325
mod serialize;

compiler/rustc_serialize/src/opaque.rs

+3
Original file line numberDiff line numberDiff line change
@@ -451,3 +451,6 @@ impl<'a> Decodable<MemDecoder<'a>> for IntEncodedWithFixedSize {
451451
IntEncodedWithFixedSize(u64::from_le_bytes(bytes))
452452
}
453453
}
454+
455+
#[cfg(test)]
456+
mod tests;

compiler/rustc_serialize/tests/opaque.rs compiler/rustc_serialize/src/opaque/tests.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
#![allow(rustc::internal)]
2-
// FIXME
3-
#![allow(unused_crate_dependencies)]
4-
51
use std::fmt::Debug;
62
use std::fs;
73

84
use rustc_macros::{Decodable_NoContext, Encodable_NoContext};
9-
use rustc_serialize::opaque::{FileEncoder, MemDecoder};
10-
use rustc_serialize::{Decodable, Encodable};
5+
6+
use crate::opaque::{FileEncoder, MemDecoder};
7+
use crate::{Decodable, Encodable};
118

129
#[derive(PartialEq, Clone, Debug, Encodable_NoContext, Decodable_NoContext)]
1310
struct Struct {

0 commit comments

Comments
 (0)