Stringification of pub(in crate) visibility removes in

[KamilaBorowska]

Code

I tried this code:

macro_rules! stringify_vis {
    ($v:vis) => { stringify!($v) }
}
fn main() {
    println!("{}", stringify_vis!(pub(in crate)));
}

I expected to see this happen: it to print pub(in crate).

Instead, this happened: it prints pub(crate).

Version it worked on

It most recently worked on: 1.62.1

Version with regression

rustc --version --verbose:

rustc 1.63.0-beta.7 (12c5b1ef3 2022-07-22)
binary: rustc
commit-hash: 12c5b1ef3882fa824a7dc6054f9f15732b44c863
commit-date: 2022-07-22
host: x86_64-unknown-linux-gnu
release: 1.63.0-beta.7
LLVM version: 14.0.5

Backtrace

Backtrace

<backtrace>

@rustbot modify labels: +regression-from-stable-to-beta -regression-untriaged

[crlf0710]

Similar effect can already be observed on stable too

macro_rules! stringify_vis {
    ($v:vis) => { stringify!($v) }
}
fn main() {
    println!("{}", stringify_vis!(pub(in self)));
}

prints pub(self) already. But it is indeed a (small?) behavior change in this beta for the in crate case.

[petrochenkov]

I would expect to see this issue in 2020, but not now when we are collecting tokens in (almost) all cases instead of converting them from AST.
Apparently for visibilities they are collected incorrectly for some reason.
cc @Aaron1011 (in case you have time for this)

[apiraino]

bisection points to 9e2f655

searched nightlies: from nightly-2022-01-01 to nightly-2022-08-03
regressed nightly: nightly-2022-05-24
searched commit range: b2eed72...ee160f2
regressed commit: 9e2f655

bisected with cargo-bisect-rustc v0.6.3

Host triple: x86_64-unknown-linux-gnu
Reproduce with:

cargo bisect-rustc --start=2022-01-01 --script=./script.sh 

The commit is a rollup so I think it's in #97254 cc @jhpratt ?

[jhpratt]

Without even looking at the rest of the rollup, it's definitely my PR. Short of storing whether in was used, I'm not sure what could be done.

[Mark-Simulacrum]

This will slip into 1.63.

[jhpratt]

I'll work on this this evening to get it resolved quickly, even if it is too late to patch the beta. I don't think it'll be too difficult.

[jhpratt]

PR is up: #100350. This also fixes stringify!(pub(in super)) to be pub(in super), which is certainly better than the status quo of pub(super).