fix Miri

[RalfJung]

This reverts #60156, which turned out to be a dead end (see #60469).

r? @oli-obk

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[oli-obk]

@bors r+ p=1

[bors]

📌 Commit b835ee53a981c01e7c0aee3b88430b0d969fdd0f has been approved by oli-obk

[RalfJung]

Force-pushed to include the fix needed for #60401.

[RalfJung]

@bors r=oli-obk

[bors]

📌 Commit 0d68836a28e0eec3ad0c48bfa3f00431c78bcd97 has been approved by oli-obk

[bors]

⌛ Testing commit 0d68836a28e0eec3ad0c48bfa3f00431c78bcd97 with merge d38c01b17fc1ddae41bf8edc169b4aad4af5af06...

[RalfJung]

Dang, we ran into some of @nnethercote's symbol changes. I'll have to figure out what we have to do in Miri there.

[01:34:34] �[0m�[1m�[38;5;9merror[E0308]�[0m�[0m�[1m: mismatched types�[0m
[01:34:34] �[0m   �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/tools/miri/src/lib.rs:481:74�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:34] �[0m�[1m�[38;5;12m481�[0m�[0m �[0m�[0m�[1m�[38;5;12m| �[0m�[0m        let link_name = match attr::first_attr_value_str_by_name(&attrs, "link_name") {�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                                                                         �[0m�[0m�[1m�[38;5;9m^^^^^^^^^^^�[0m�[0m �[0m�[0m�[1m�[38;5;9mexpected struct `syntax::ast::Name`, found reference�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: expected type `�[0m�[0m�[1msyntax::ast::Name�[0m�[0m`�[0m
[01:34:34] �[0m               found type `�[0m�[0m�[1m&'static str�[0m�[0m`�[0m
[01:34:34] 
[01:34:34] �[0m�[1m�[38;5;9merror[E0308]�[0m�[0m�[1m: mismatched types�[0m
[01:34:34] �[0m   �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/tools/miri/src/fn_call.rs:144:74�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:34] �[0m�[1m�[38;5;12m144�[0m�[0m �[0m�[0m�[1m�[38;5;12m| �[0m�[0m        let link_name = match attr::first_attr_value_str_by_name(&attrs, "link_name") {�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                                                                         �[0m�[0m�[1m�[38;5;9m^^^^^^^^^^^�[0m�[0m �[0m�[0m�[1m�[38;5;9mexpected struct `syntax::ast::Name`, found reference�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:34] �[0m    �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: expected type `�[0m�[0m�[1msyntax::ast::Name�[0m�[0m`�[0m
[01:34:34] �[0m               found type `�[0m�[0m�[1m&'static str�[0m�[0m`�[0m
[01:34:34] 
[01:34:35] �[0m�[1m�[38;5;9merror[E0308]�[0m�[0m�[1m: mismatched types�[0m
[01:34:35] �[0m  �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/tools/miri/src/helpers.rs:17:68�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:35] �[0m�[1m�[38;5;12m17�[0m�[0m �[0m�[0m�[1m�[38;5;12m| �[0m�[0m            .find(|&&krate| this.tcx.original_crate_name(krate) == path[0])�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                                                                   �[0m�[0m�[1m�[38;5;9m^^^^^^^�[0m�[0m �[0m�[0m�[1m�[38;5;9mexpected struct `syntax::ast::Name`, found &str�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: expected type `�[0m�[0m�[1msyntax::ast::Name�[0m�[0m`�[0m
[01:34:35] �[0m              found type `�[0m�[0m�[1m&str�[0m�[0m`�[0m
[01:34:35] 
[01:34:35] �[0m�[1m�[38;5;9merror[E0308]�[0m�[0m�[1m: mismatched types�[0m
[01:34:35] �[0m  �[0m�[0m�[1m�[38;5;12m--> �[0m�[0msrc/tools/miri/src/helpers.rs:28:47�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:35] �[0m�[1m�[38;5;12m28�[0m�[0m �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                        if item.ident.name == *segment {�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m| �[0m�[0m                                              �[0m�[0m�[1m�[38;5;9m^^^^^^^^�[0m�[0m �[0m�[0m�[1m�[38;5;9mexpected struct `syntax::ast::Name`, found &str�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m|�[0m
[01:34:35] �[0m   �[0m�[0m�[1m�[38;5;12m= �[0m�[0m�[1mnote�[0m�[0m: expected type `�[0m�[0m�[1msyntax::ast::Name�[0m�[0m`�[0m
[01:34:35] �[0m              found type `�[0m�[0m�[1m&str�[0m�[0m`�[0m
[01:34:35] 
[01:34:36] �[0m�[1m�[38;5;9merror�[0m�[0m�[1m: aborting due to 4 previous errors�[0m

[bors]

💔 Test failed - checks-travis

[RalfJung]

@bors r=oli-obk

[bors]

📌 Commit 43207ca has been approved by oli-obk

[bors]

🌲 The tree is currently closed for pull requests below priority 500, this pull request will be tested once the tree is reopened

[nnethercote]

This comment may be helpful.

[RalfJung]

I did this, does that seem reasonable?

[nnethercote]

Looks fine to me!