Skip to content

Commit 8d55a57

Browse files
committed
Auto merge of #831 - lzutao:rustup, r=RalfJung
Remove SliceConcatExt import rustup rust-lang/rust#62403 cc rust-lang/rust#62347
2 parents 67fd5a4 + 3ea62d3 commit 8d55a57

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/shims/intrinsics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rustc::ty::layout::{self, LayoutOf, Size};
55
use rustc::ty;
66

77
use crate::{
8-
PlaceTy, OpTy, ImmTy, Immediate, Scalar, ScalarMaybeUndef, Tag,
8+
PlaceTy, OpTy, ImmTy, Immediate, Scalar, Tag,
99
OperatorEvalContextExt
1010
};
1111

tests/compiletest.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
#![feature(slice_concat_ext, custom_test_frameworks)]
1+
#![feature(custom_test_frameworks)]
22
// Custom test runner, to avoid libtest being wrapped around compiletest which wraps libtest.
33
#![test_runner(test_runner)]
44

5-
use std::slice::SliceConcatExt;
65
use std::path::PathBuf;
76
use std::env;
87

0 commit comments

Comments
 (0)