bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Tiny cleanup to size assertions

Browse source
This commit is contained in:
Vadim Petrochenkov 2019-11-11 22:18:35 +03:00
parent 56237d75b4
commit e7c42f0cf0
4 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_errors/lib.rs
View file

@ -15,8 +15,6 @@ use Level::*;
use emitter::{Emitter, EmitterWriter, is_case_difference}; use emitter::{Emitter, EmitterWriter, is_case_difference};
use registry::Registry; use registry::Registry;
#[cfg(target_arch = "x86_64")]
use rustc_data_structures::static_assert_size;
use rustc_data_structures::sync::{self, Lrc, Lock}; use rustc_data_structures::sync::{self, Lrc, Lock};
use rustc_data_structures::fx::{FxHashSet, FxIndexMap}; use rustc_data_structures::fx::{FxHashSet, FxIndexMap};
use rustc_data_structures::stable_hasher::StableHasher; use rustc_data_structures::stable_hasher::StableHasher;
@ -54,7 +52,7 @@ pub type PResult<'a, T> = Result<T, DiagnosticBuilder<'a>>;
// `PResult` is used a lot. Make sure it doesn't unintentionally get bigger. // `PResult` is used a lot. Make sure it doesn't unintentionally get bigger.
// (See also the comment on `DiagnosticBuilderInner`.) // (See also the comment on `DiagnosticBuilderInner`.)
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
static_assert_size!(PResult<'_, bool>, 16); rustc_data_structures::static_assert_size!(PResult<'_, bool>, 16);
/// Indicates the confidence in the correctness of a suggestion. /// Indicates the confidence in the correctness of a suggestion.
/// ///

5
src/libsyntax/ast.rs
View file

@ -38,9 +38,6 @@ use rustc_data_structures::thin_vec::ThinVec;
use rustc_index::vec::Idx; use rustc_index::vec::Idx;
use rustc_serialize::{self, Decoder, Encoder}; use rustc_serialize::{self, Decoder, Encoder};
#[cfg(target_arch = "x86_64")]
use rustc_data_structures::static_assert_size;
use std::fmt; use std::fmt;
#[cfg(test)] #[cfg(test)]
@ -1028,7 +1025,7 @@ pub struct Expr {
// `Expr` is used a lot. Make sure it doesn't unintentionally get bigger. // `Expr` is used a lot. Make sure it doesn't unintentionally get bigger.
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
static_assert_size!(Expr, 96); rustc_data_structures::static_assert_size!(Expr, 96);
impl Expr { impl Expr {
/// Returns `true` if this expression would be valid somewhere that expects a value; /// Returns `true` if this expression would be valid somewhere that expects a value;

4
src/libsyntax/token.rs
View file

@ -14,8 +14,6 @@ use syntax_pos::{self, Span, DUMMY_SP};
use std::fmt; use std::fmt;
use std::mem; use std::mem;
#[cfg(target_arch = "x86_64")]
use rustc_data_structures::static_assert_size;
use rustc_data_structures::sync::Lrc; use rustc_data_structures::sync::Lrc;
#[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)] #[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)]
@ -261,7 +259,7 @@ pub enum TokenKind {
// `TokenKind` is used a lot. Make sure it doesn't unintentionally get bigger. // `TokenKind` is used a lot. Make sure it doesn't unintentionally get bigger.
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
static_assert_size!(TokenKind, 16); rustc_data_structures::static_assert_size!(TokenKind, 16);
#[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Debug)] #[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Debug)]
pub struct Token { pub struct Token {

4
src/libsyntax/tokenstream.rs
View file

@ -16,8 +16,6 @@
use crate::token::{self, DelimToken, Token, TokenKind}; use crate::token::{self, DelimToken, Token, TokenKind};
use syntax_pos::{Span, DUMMY_SP}; use syntax_pos::{Span, DUMMY_SP};
#[cfg(target_arch = "x86_64")]
use rustc_data_structures::static_assert_size;
use rustc_data_structures::sync::Lrc; use rustc_data_structures::sync::Lrc;
use smallvec::{SmallVec, smallvec}; use smallvec::{SmallVec, smallvec};
@ -129,7 +127,7 @@ pub type TreeAndJoint = (TokenTree, IsJoint);
// `TokenStream` is used a lot. Make sure it doesn't unintentionally get bigger. // `TokenStream` is used a lot. Make sure it doesn't unintentionally get bigger.
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
static_assert_size!(TokenStream, 8); rustc_data_structures::static_assert_size!(TokenStream, 8);
#[derive(Clone, Copy, Debug, PartialEq, RustcEncodable, RustcDecodable)] #[derive(Clone, Copy, Debug, PartialEq, RustcEncodable, RustcDecodable)]
pub enum IsJoint { pub enum IsJoint {