user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #135943 - hkBst:opt_imports, r=estebank

Browse source 
Rename `Piece::String` to `Piece::Lit`

This renames Piece::String to Piece::Lit to avoid shadowing std::string::String and removes "pub use Piece::*;".
This commit is contained in:
León Orell Valerian Liehr 2025-01-29 03:12:19 +01:00 • committed by GitHub
commit dbb092b671
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 33 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/rust-analyzer/crates/hir-def/src/body/lower/asm.rs
View file

@ -229,7 +229,7 @@ impl ExprCollector<'_> {
};
for piece in unverified_pieces {
match piece {
rustc_parse_format::Piece::String(_) => {}
rustc_parse_format::Piece::Lit(_) => {}
rustc_parse_format::Piece::NextArgument(arg) => {
// let span = arg_spans.next();

2
src/tools/rust-analyzer/crates/hir-def/src/hir/format_args.rs
View file

@ -287,7 +287,7 @@ pub(crate) fn parse(
for piece in pieces {
match piece {
parse::Piece::String(s) => {
parse::Piece::Lit(s) => {
unfinished_literal.push_str(s);
}
parse::Piece::NextArgument(arg) => {