Skip to content
This repository was archived by the owner on May 23, 2024. It is now read-only.

Commit 73061d9

Browse files
authored
Merge pull request #1485 from JohnTitor/use-edition-2021-for-ices
2 parents f19817c + 387ed65 commit 73061d9

File tree

8 files changed

+7
-33
lines changed

8 files changed

+7
-33
lines changed

ices/54888.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ where
1515

1616

1717
fn main() {
18-
let foo = Ptr(Box::new(5)) as Ptr<::std::any::Any>;
18+
let foo = Ptr(Box::new(5)) as Ptr<dyn std::any::Any>;
1919
}

ices/79590.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ impl Restriction for Test {
1313

1414
fn main() {
1515
let t = Test {};
16-
let x: &Database<Inner = _> = &t;
16+
let x: &dyn Database<Inner = _> = &t;
1717
}

ices/93242-1.sh renamed to ices/93242-1.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
rustc --edition 2021 - 2>&1 << EOF
2-
31
pub async fn something(path: &[usize]) -> usize {
42
// Without this async block it doesn't ICE
53
async {
@@ -15,6 +13,4 @@ pub async fn something(path: &[usize]) -> usize {
1513
.await
1614
}
1715

18-
pub fn main() {}
19-
20-
EOF
16+
fn main() {}
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
rustc --edition 2021 - 2>&1 << EOF
2-
31
pub fn something(path: &[usize]) -> impl Fn() -> usize {
42
|| match path {
53
[] => 0,
64
_ => 1,
75
}
86
}
97

10-
pub fn main() {}
11-
12-
EOF
8+
fn main() {}

ices/97534-1.sh renamed to ices/97534-1.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#!/bin/sh
2-
3-
rustc --edition=2021 - << EOF
4-
51
macro_rules! m {
62
() => {
73
macro_rules! foo {
@@ -17,6 +13,4 @@ use bar as baz;
1713

1814
baz!{}
1915

20-
pub fn main() {}
21-
22-
EOF
16+
fn main() {}

ices/97534-2.sh renamed to ices/97534-2.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#!/bin/sh
2-
3-
rustc --edition=2021 - << EOF
4-
51
macro_rules! foo {
62
() => {};
73
}
@@ -18,6 +14,4 @@ use bar as baz;
1814

1915
baz! {}
2016

21-
pub fn main() {}
22-
23-
EOF
17+
fn main() {}
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#!/bin/bash
2-
3-
rustc --edition=2021 - <<'EOF'
4-
51
#![feature(type_alias_impl_trait)]
62

73
#[derive(Copy, Clone)]
@@ -14,5 +10,3 @@ fn main() {
1410
let Foo((a, b)) = foo;
1511
};
1612
}
17-
18-
EOF

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl ICE {
5050
let workdir = tempfile::tempdir()?;
5151
let output = match self.mode {
5252
TestMode::SingleFile => Command::new(RUSTC)
53-
.args(["--edition", "2018"])
53+
.args(["--edition", "2021"])
5454
.arg(std::fs::canonicalize(&self.path)?)
5555
.current_dir(workdir.path())
5656
.output()?,

0 commit comments

Comments
 (0)