rustc 658

[ctaggart]

I bumped the rustc dependency to 658 and ran cargo update. This should make rustfmt_lib work in wasm #4132 (comment) .

[ctaggart]

It is erroring out with:

    Compiling rustc-ap-rustc_parse v658.0.0
error: environment variable `CFG_RELEASE_CHANNEL` not defined
   --> /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/rustc-ap-rustc_attr-658.0.0/builtin.rs:655:27
    |
655 |             let channel = env!("CFG_RELEASE_CHANNEL");
    |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^

[ctaggart]

I was able to reproduce locally. If I set

export CFG_RELEASE_CHANNEL=nightly

I then get an error about CFG_RELEASE not being set.

   Compiling rustc-ap-rustc_parse v658.0.0
error: environment variable `CFG_RELEASE` not defined
   --> /Users/cameron/.cargo/registry/src/github.com-1ecc6299db9ec823/rustc-ap-rustc_attr-658.0.0/builtin.rs:657:48
    |
657 |             let rustc_version = Version::parse(env!("CFG_RELEASE")).unwrap();
    |                 

If I then set

export CFG_RELEASE=658.0.0

It then looks like some stuff may have moved around in the ast:

   Compiling rustfmt_lib v2.0.0-rc.1 (/Users/cameron/rs/rustfmt/rustfmt-core/rustfmt-lib)
error[E0412]: cannot find type `Name` in module `ast`
   --> rustfmt-core/rustfmt-lib/src/macros.rs:621:23
    |
621 |     MetaVariable(ast::Name, String),
    |                       ^^^^ not found in `ast`
    |
help: there is an enum variant `rustc_ast_pretty::pprust::AnnNode::Name`; try using the variant's enum
    |
621 |     MetaVariable(rustc_ast_pretty::pprust::AnnNode, String),
    |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error[E0603]: struct `Ident` is private
  --> rustfmt-core/rustfmt-lib/src/utils.rs:27:78
   |
27 | pub(crate) fn rewrite_ident<'a>(context: &'a RewriteContext<'_>, ident: ast::Ident) -> &'a str {
   |                                                                              ^^^^^ private struct
   |
note: the struct `Ident` is defined here
  --> /Users/cameron/.cargo/registry/src/github.com-1ecc6299db9ec823/rustc-ap-rustc_ast-658.0.0/ast.rs:35:35
   |
35 | use rustc_span::symbol::{kw, sym, Ident, Symbol};
   |                                   ^^^^^

error[E0603]: struct `Ident` is private
   --> rustfmt-core/rustfmt-lib/src/chains.rs:119:22
    |
119 |     StructField(ast::Ident),
    |                      ^^^^^ private struct

[ctaggart]

I'd like to see this upgraded, but I don't know how.

[calebcartwright]

IIRC, Ident is defined in rustc_span and has just historically been re-exported from rustc_ast. Assuming that's the case it should be a relatively simple refactor within rustfmt to import from rustc_span (which is already in our dep tree).

If the visibility of Ident has been removed that'd be a huge problem for us though

[CAD97]

The rustc_ast re-export was removed in rust-lang/rust#71555.

[CAD97]

Reopened as #4177.