diff options
| author | bors <bors@rust-lang.org> | 2024-07-25 18:05:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-25 18:05:00 +0000 |
| commit | aa877bc71c8c8082122bee23d17c8669f30f275d (patch) | |
| tree | 1ab3cc23cee9f3240950faa293515c9536120f33 /compiler/rustc_ast/src | |
| parent | eb10639928a2781cf0a12440007fbcc1e3a6888f (diff) | |
| parent | cf1ce4becabf3f07b82c7dac4fd4aa3d544c3b21 (diff) | |
| download | rust-aa877bc71c8c8082122bee23d17c8669f30f275d.tar.gz rust-aa877bc71c8c8082122bee23d17c8669f30f275d.zip | |
Auto merge of #128195 - matthiaskrgr:rollup-195dfdf, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #126908 (Use Cow<'static, str> for InlineAsmTemplatePiece::String) - #127999 (Inject arm32 shims into Windows metadata generation) - #128137 (CStr: derive PartialEq, Eq; add test for Ord) - #128185 (Fix a span error when parsing a wrong param of function.) - #128187 (Fix 1.80.0 version in RELEASES.md) - #128189 (Turn an unreachable code path into an ICE) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_ast/src')
| -rw-r--r-- | compiler/rustc_ast/src/ast.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs index 411fc8311a0..564213ee7ee 100644 --- a/compiler/rustc_ast/src/ast.rs +++ b/compiler/rustc_ast/src/ast.rs @@ -36,6 +36,7 @@ use rustc_macros::{Decodable, Encodable, HashStable_Generic}; use rustc_span::source_map::{respan, Spanned}; use rustc_span::symbol::{kw, sym, Ident, Symbol}; use rustc_span::{ErrorGuaranteed, Span, DUMMY_SP}; +use std::borrow::Cow; use std::cmp; use std::fmt; use std::mem; @@ -2308,7 +2309,7 @@ impl std::fmt::Debug for InlineAsmOptions { #[derive(Clone, PartialEq, Encodable, Decodable, Debug, Hash, HashStable_Generic)] pub enum InlineAsmTemplatePiece { - String(String), + String(Cow<'static, str>), Placeholder { operand_idx: usize, modifier: Option<char>, span: Span }, } |