Merge pull request #234 from paulcacheux/paulcacheux/remove-rustc-patch

Remove not applicable rustc patch
This commit is contained in:
antoyo 2022-10-17 12:14:18 -04:00 committed by GitHub
commit 618553b9b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 16 deletions

View File

@ -1,14 +0,0 @@
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index 887d27fd6dca4..2c2239f2b83d1 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -806,8 +806,8 @@ pub fn make_test_description<R: Read>(
cfg: Option<&str>,
) -> test::TestDesc {
let mut ignore = false;
#[cfg(not(bootstrap))]
- let ignore_message: Option<String> = None;
+ let ignore_message: Option<&str> = None;
let mut should_fail = false;
let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some();

View File

@ -296,8 +296,6 @@ function test_rustc() {
git checkout $(rustc -V | cut -d' ' -f3 | tr -d '(') git checkout $(rustc -V | cut -d' ' -f3 | tr -d '(')
export RUSTFLAGS= export RUSTFLAGS=
git apply ../rustc_patches/compile_test.patch || true
rm config.toml || true rm config.toml || true
cat > config.toml <<EOF cat > config.toml <<EOF