Skip to content

Commit a6cebcd

Browse files
rikosellicVerus CI Bot
authored andcommitted
Fix for asterinas
1 parent c5b8780 commit a6cebcd

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

source/rust_verify/src/attributes.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,4 +1425,7 @@ pub const RUSTC_ATTRS_OK_TO_IGNORE: &[&str] = &[
14251425
"rustc_insignificant_dtor",
14261426
// Boxes
14271427
"rustc_box",
1428+
// Support for separate definition of struct type and member methods
1429+
"rustc_has_incoherent_inherent_impls",
1430+
"rustc_allow_incoherent_impl",
14281431
];

tools/vargo/src/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn get_rust_toolchain(
6969

7070
if !in_nextest {
7171
let active_toolchain_re =
72-
Regex::new(r"^(([A-Za-z0-9.-]+)-(?:aarch64|x86_64)-[A-Za-z0-9]+-[A-Za-z0-9-]+)")
72+
Regex::new(r"^(([A-Za-z0-9.-]+)-(?:aarch64|x86_64)-[A-Za-z0-9]+-[A-Za-z0-9-]+) \((?:overridden|environment override) by '?(.*)'?\)")
7373
.unwrap();
7474

7575
let rustup_output = run_rustup_toolchain()?;

0 commit comments

Comments
 (0)