diff options
| author | León Orell Valerian Liehr <me@fmease.dev> | 2025-01-29 03:12:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-29 03:12:19 +0100 |
| commit | dbb092b671a9b0d8d17447b4bca3766d8731ccef (patch) | |
| tree | ece62aaa6ba33d7621611c08218923c32709e3de /src | |
| parent | 42f46437bacd23d092f04271d4011902b7b44db2 (diff) | |
| parent | 3026545ab50e65fcd1c888b77272032000e36147 (diff) | |
| download | rust-dbb092b671a9b0d8d17447b4bca3766d8731ccef.tar.gz rust-dbb092b671a9b0d8d17447b4bca3766d8731ccef.zip | |
Rollup merge of #135943 - hkBst:opt_imports, r=estebank
Rename `Piece::String` to `Piece::Lit` This renames Piece::String to Piece::Lit to avoid shadowing std::string::String and removes "pub use Piece::*;".
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/rust-analyzer/crates/hir-def/src/body/lower/asm.rs | 2 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/crates/hir-def/src/hir/format_args.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/rust-analyzer/crates/hir-def/src/body/lower/asm.rs b/src/tools/rust-analyzer/crates/hir-def/src/body/lower/asm.rs index 68c7173d1e4..994ba2aa069 100644 --- a/src/tools/rust-analyzer/crates/hir-def/src/body/lower/asm.rs +++ b/src/tools/rust-analyzer/crates/hir-def/src/body/lower/asm.rs @@ -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(); diff --git a/src/tools/rust-analyzer/crates/hir-def/src/hir/format_args.rs b/src/tools/rust-analyzer/crates/hir-def/src/hir/format_args.rs index e64e498c170..28c824fd31d 100644 --- a/src/tools/rust-analyzer/crates/hir-def/src/hir/format_args.rs +++ b/src/tools/rust-analyzer/crates/hir-def/src/hir/format_args.rs @@ -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) => { |