Merge from rustc · model-checking/verify-rust-std@652f0b8

@@ -41,18 +41,18 @@

4141

#[allow_internal_unstable(rustc_attrs, liballoc_internals)]

4242

macro_rules! vec {

4343

() => (

44-

$crate::__rust_force_expr!($crate::vec::Vec::new())

44+

$crate::vec::Vec::new()

4545

);

4646

($elem:expr; $n:expr) => (

47-

$crate::__rust_force_expr!($crate::vec::from_elem($elem, $n))

47+

$crate::vec::from_elem($elem, $n)

4848

);

4949

($($x:expr),+ $(,)?) => (

50-

$crate::__rust_force_expr!(<[_]>::into_vec(

50+

<[_]>::into_vec(

5151

// This rustc_box is not required, but it produces a dramatic improvement in compile

5252

// time when constructing arrays with many elements.

5353

#[rustc_box]

5454

$crate::boxed::Box::new([$($x),+])

55-

))

55+

)

5656

);

5757

}

5858

@@ -126,13 +126,3 @@ macro_rules! format {

126126

res

127127

}}

128128

}

129-130-

/// Force AST node to an expression to improve diagnostics in pattern position.

131-

#[doc(hidden)]

132-

#[macro_export]

133-

#[unstable(feature = "liballoc_internals", issue = "none", reason = "implementation detail")]

134-

macro_rules! __rust_force_expr {

135-

($e:expr) => {

136-

$e

137-

};

138-

}