Skip to content

Commit cbddf31

Browse files
borsbors
committed
Auto merge of rust-lang#121142 - GuillaumeGomez:rollup-5qmksjw, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - rust-lang#120449 (Document requirements for unsized {Rc,Arc}::from_raw) - rust-lang#120505 (Fix BTreeMap's Cursor::remove_{next,prev}) - rust-lang#120672 (std::thread update freebsd stack guard handling.) - rust-lang#121088 (Implicitly enable evex512 if avx512 is enabled) - rust-lang#121104 (Ignore unsized types when trying to determine the size of the original type) - rust-lang#121107 (Fix msg for verbose suggestions with confusable capitalization) - rust-lang#121113 (Continue compilation even if inherent impl checks fail) - rust-lang#121120 (Add `ErrorGuaranteed` to `ast::LitKind::Err`, `token::LitKind::Err`.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 62fb0db + 06f53dd commit cbddf31

File tree

58 files changed

+630
-277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+630
-277
lines changed

Diff for: ‎compiler/rustc_ast/src/ast.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1846,7 +1846,7 @@ pub enum LitKind {
18461846
/// A boolean literal (`true`, `false`).
18471847
Bool(bool),
18481848
/// Placeholder for a literal that wasn't well-formed in some way.
1849-
Err,
1849+
Err(ErrorGuaranteed),
18501850
}
18511851

18521852
impl LitKind {
@@ -1893,7 +1893,7 @@ impl LitKind {
18931893
| LitKind::Int(_, LitIntType::Unsuffixed)
18941894
| LitKind::Float(_, LitFloatType::Unsuffixed)
18951895
| LitKind::Bool(..)
1896-
| LitKind::Err => false,
1896+
| LitKind::Err(_) => false,
18971897
}
18981898
}
18991899
}

Diff for: ‎compiler/rustc_ast/src/token.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_macros::HashStable_Generic;
1313
use rustc_span::symbol::{kw, sym};
1414
#[allow(hidden_glob_reexports)]
1515
use rustc_span::symbol::{Ident, Symbol};
16-
use rustc_span::{edition::Edition, Span, DUMMY_SP};
16+
use rustc_span::{edition::Edition, ErrorGuaranteed, Span, DUMMY_SP};
1717
use std::borrow::Cow;
1818
use std::fmt;
1919

@@ -75,7 +75,7 @@ pub enum LitKind {
7575
ByteStrRaw(u8), // raw byte string delimited by `n` hash symbols
7676
CStr,
7777
CStrRaw(u8),
78-
Err,
78+
Err(ErrorGuaranteed),
7979
}
8080

8181
/// A literal token.
@@ -144,7 +144,7 @@ impl fmt::Display for Lit {
144144
CStrRaw(n) => {
145145
write!(f, "cr{delim}\"{symbol}\"{delim}", delim = "#".repeat(n as usize))?
146146
}
147-
Integer | Float | Bool | Err => write!(f, "{symbol}")?,
147+
Integer | Float | Bool | Err(_) => write!(f, "{symbol}")?,
148148
}
149149

150150
if let Some(suffix) = suffix {
@@ -159,7 +159,7 @@ impl LitKind {
159159
/// An English article for the literal token kind.
160160
pub fn article(self) -> &'static str {
161161
match self {
162-
Integer | Err => "an",
162+
Integer | Err(_) => "an",
163163
_ => "a",
164164
}
165165
}
@@ -174,12 +174,12 @@ impl LitKind {
174174
Str | StrRaw(..) => "string",
175175
ByteStr | ByteStrRaw(..) => "byte string",
176176
CStr | CStrRaw(..) => "C string",
177-
Err => "error",
177+
Err(_) => "error",
178178
}
179179
}
180180

181181
pub(crate) fn may_have_suffix(self) -> bool {
182-
matches!(self, Integer | Float | Err)
182+
matches!(self, Integer | Float | Err(_))
183183
}
184184
}
185185

Diff for: ‎compiler/rustc_ast/src/util/literal.rs

+19-22
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,21 @@ pub fn escape_byte_str_symbol(bytes: &[u8]) -> Symbol {
3131

3232
#[derive(Debug)]
3333
pub enum LitError {
34-
LexerError,
35-
InvalidSuffix,
36-
InvalidIntSuffix,
37-
InvalidFloatSuffix,
38-
NonDecimalFloat(u32),
39-
IntTooLarge(u32),
34+
InvalidSuffix(Symbol),
35+
InvalidIntSuffix(Symbol),
36+
InvalidFloatSuffix(Symbol),
37+
NonDecimalFloat(u32), // u32 is the base
38+
IntTooLarge(u32), // u32 is the base
4039
}
4140

4241
impl LitKind {
4342
/// Converts literal token into a semantic literal.
4443
pub fn from_token_lit(lit: token::Lit) -> Result<LitKind, LitError> {
4544
let token::Lit { kind, symbol, suffix } = lit;
46-
if suffix.is_some() && !kind.may_have_suffix() {
47-
return Err(LitError::InvalidSuffix);
45+
if let Some(suffix) = suffix
46+
&& !kind.may_have_suffix()
47+
{
48+
return Err(LitError::InvalidSuffix(suffix));
4849
}
4950

5051
// For byte/char/string literals, chars and escapes have already been
@@ -145,7 +146,7 @@ impl LitKind {
145146
buf.push(0);
146147
LitKind::CStr(buf.into(), StrStyle::Raw(n))
147148
}
148-
token::Err => LitKind::Err,
149+
token::Err(guar) => LitKind::Err(guar),
149150
})
150151
}
151152
}
@@ -202,7 +203,7 @@ impl fmt::Display for LitKind {
202203
}
203204
}
204205
LitKind::Bool(b) => write!(f, "{}", if b { "true" } else { "false" })?,
205-
LitKind::Err => {
206+
LitKind::Err(_) => {
206207
// This only shows up in places like `-Zunpretty=hir` output, so we
207208
// don't bother to produce something useful.
208209
write!(f, "<bad-literal>")?;
@@ -238,7 +239,7 @@ impl MetaItemLit {
238239
LitKind::Char(_) => token::Char,
239240
LitKind::Int(..) => token::Integer,
240241
LitKind::Float(..) => token::Float,
241-
LitKind::Err => token::Err,
242+
LitKind::Err(guar) => token::Err(guar),
242243
};
243244

244245
token::Lit::new(kind, self.symbol, self.suffix)
@@ -272,12 +273,12 @@ fn filtered_float_lit(
272273
return Err(LitError::NonDecimalFloat(base));
273274
}
274275
Ok(match suffix {
275-
Some(suf) => LitKind::Float(
276+
Some(suffix) => LitKind::Float(
276277
symbol,
277-
ast::LitFloatType::Suffixed(match suf {
278+
ast::LitFloatType::Suffixed(match suffix {
278279
sym::f32 => ast::FloatTy::F32,
279280
sym::f64 => ast::FloatTy::F64,
280-
_ => return Err(LitError::InvalidFloatSuffix),
281+
_ => return Err(LitError::InvalidFloatSuffix(suffix)),
281282
}),
282283
),
283284
None => LitKind::Float(symbol, ast::LitFloatType::Unsuffixed),
@@ -318,17 +319,13 @@ fn integer_lit(symbol: Symbol, suffix: Option<Symbol>) -> Result<LitKind, LitErr
318319
// `1f64` and `2f32` etc. are valid float literals, and
319320
// `fxxx` looks more like an invalid float literal than invalid integer literal.
320321
_ if suf.as_str().starts_with('f') => return filtered_float_lit(symbol, suffix, base),
321-
_ => return Err(LitError::InvalidIntSuffix),
322+
_ => return Err(LitError::InvalidIntSuffix(suf)),
322323
},
323324
_ => ast::LitIntType::Unsuffixed,
324325
};
325326

326327
let s = &s[if base != 10 { 2 } else { 0 }..];
327-
u128::from_str_radix(s, base).map(|i| LitKind::Int(i.into(), ty)).map_err(|_| {
328-
// Small bases are lexed as if they were base 10, e.g, the string
329-
// might be `0b10201`. This will cause the conversion above to fail,
330-
// but these kinds of errors are already reported by the lexer.
331-
let from_lexer = base < 10 && s.chars().any(|c| c.to_digit(10).is_some_and(|d| d >= base));
332-
if from_lexer { LitError::LexerError } else { LitError::IntTooLarge(base) }
333-
})
328+
u128::from_str_radix(s, base)
329+
.map(|i| LitKind::Int(i.into(), ty))
330+
.map_err(|_| LitError::IntTooLarge(base))
334331
}

Diff for: ‎compiler/rustc_ast_lowering/src/expr.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
124124
let lit_kind = match LitKind::from_token_lit(*token_lit) {
125125
Ok(lit_kind) => lit_kind,
126126
Err(err) => {
127-
report_lit_error(&self.tcx.sess.parse_sess, err, *token_lit, e.span);
128-
LitKind::Err
127+
let guar = report_lit_error(
128+
&self.tcx.sess.parse_sess,
129+
err,
130+
*token_lit,
131+
e.span,
132+
);
133+
LitKind::Err(guar)
129134
}
130135
};
131136
let lit = self.arena.alloc(respan(self.lower_span(e.span), lit_kind));

Diff for: ‎compiler/rustc_ast_lowering/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -966,10 +966,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
966966
{
967967
lit
968968
} else {
969+
let guar = self.dcx().has_errors().unwrap();
969970
MetaItemLit {
970971
symbol: kw::Empty,
971972
suffix: None,
972-
kind: LitKind::Err,
973+
kind: LitKind::Err(guar),
973974
span: DUMMY_SP,
974975
}
975976
};

Diff for: ‎compiler/rustc_ast_pretty/src/pprust/state.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ fn literal_to_string(lit: token::Lit) -> String {
254254
token::CStrRaw(n) => {
255255
format!("cr{delim}\"{symbol}\"{delim}", delim = "#".repeat(n as usize))
256256
}
257-
token::Integer | token::Float | token::Bool | token::Err => symbol.to_string(),
257+
token::Integer | token::Float | token::Bool | token::Err(_) => symbol.to_string(),
258258
};
259259

260260
if let Some(suffix) = suffix {

Diff for: ‎compiler/rustc_builtin_macros/src/concat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn expand_concat(
4040
cx.dcx().emit_err(errors::ConcatBytestr { span: e.span });
4141
has_errors = true;
4242
}
43-
Ok(ast::LitKind::Err) => {
43+
Ok(ast::LitKind::Err(_)) => {
4444
has_errors = true;
4545
}
4646
Err(err) => {

Diff for: ‎compiler/rustc_builtin_macros/src/concat_bytes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fn invalid_type_err(
4444
Ok(ast::LitKind::Bool(_)) => {
4545
dcx.emit_err(ConcatBytesInvalid { span, lit_kind: "boolean", sugg: None });
4646
}
47-
Ok(ast::LitKind::Err) => {}
47+
Ok(ast::LitKind::Err(_)) => {}
4848
Ok(ast::LitKind::Int(_, _)) if !is_nested => {
4949
let sugg =
5050
snippet.map(|snippet| ConcatBytesInvalidSuggestion::IntLit { span: span, snippet });

Diff for: ‎compiler/rustc_codegen_llvm/src/llvm_util.rs

+4
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,10 @@ pub fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> LLVMFeature<'a> {
266266
("riscv32" | "riscv64", "fast-unaligned-access") if get_version().0 <= 17 => {
267267
LLVMFeature::new("unaligned-scalar-mem")
268268
}
269+
// For LLVM 18, enable the evex512 target feature if a avx512 target feature is enabled.
270+
("x86", s) if get_version().0 >= 18 && s.starts_with("avx512") => {
271+
LLVMFeature::with_dependency(s, TargetFeatureFoldStrength::EnableOnly("evex512"))
272+
}
269273
(_, s) => LLVMFeature::new(s),
270274
}
271275
}

Diff for: ‎compiler/rustc_errors/src/emitter.rs

+10-9
Original file line numberDiff line numberDiff line change
@@ -1743,9 +1743,17 @@ impl HumanEmitter {
17431743
buffer.append(0, level.to_str(), Style::Level(*level));
17441744
buffer.append(0, ": ", Style::HeaderMsg);
17451745

1746+
let mut msg = vec![(suggestion.msg.to_owned(), Style::NoStyle)];
1747+
if suggestions
1748+
.iter()
1749+
.take(MAX_SUGGESTIONS)
1750+
.any(|(_, _, _, only_capitalization)| *only_capitalization)
1751+
{
1752+
msg.push((" (notice the capitalization difference)".into(), Style::NoStyle));
1753+
}
17461754
self.msgs_to_buffer(
17471755
&mut buffer,
1748-
&[(suggestion.msg.to_owned(), Style::NoStyle)],
1756+
&msg,
17491757
args,
17501758
max_line_num_len,
17511759
"suggestion",
@@ -1754,12 +1762,8 @@ impl HumanEmitter {
17541762

17551763
let mut row_num = 2;
17561764
draw_col_separator_no_space(&mut buffer, 1, max_line_num_len + 1);
1757-
let mut notice_capitalization = false;
1758-
for (complete, parts, highlights, only_capitalization) in
1759-
suggestions.iter().take(MAX_SUGGESTIONS)
1760-
{
1765+
for (complete, parts, highlights, _) in suggestions.iter().take(MAX_SUGGESTIONS) {
17611766
debug!(?complete, ?parts, ?highlights);
1762-
notice_capitalization |= only_capitalization;
17631767

17641768
let has_deletion = parts.iter().any(|p| p.is_deletion(sm));
17651769
let is_multiline = complete.lines().count() > 1;
@@ -2058,9 +2062,6 @@ impl HumanEmitter {
20582062
let others = suggestions.len() - MAX_SUGGESTIONS;
20592063
let msg = format!("and {} other candidate{}", others, pluralize!(others));
20602064
buffer.puts(row_num, max_line_num_len + 3, &msg, Style::NoStyle);
2061-
} else if notice_capitalization {
2062-
let msg = "notice the capitalization difference";
2063-
buffer.puts(row_num, max_line_num_len + 3, msg, Style::NoStyle);
20642065
}
20652066
emit_to_destination(&buffer.render(), level, &mut self.dst, self.short_message)?;
20662067
Ok(())

Diff for: ‎compiler/rustc_errors/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,9 @@ impl CodeSuggestion {
320320
// We need to keep track of the difference between the existing code and the added
321321
// or deleted code in order to point at the correct column *after* substitution.
322322
let mut acc = 0;
323+
let mut only_capitalization = false;
323324
for part in &substitution.parts {
325+
only_capitalization |= is_case_difference(sm, &part.snippet, part.span);
324326
let cur_lo = sm.lookup_char_pos(part.span.lo());
325327
if prev_hi.line == cur_lo.line {
326328
let mut count =
@@ -393,7 +395,6 @@ impl CodeSuggestion {
393395
}
394396
}
395397
highlights.push(std::mem::take(&mut line_highlight));
396-
let only_capitalization = is_case_difference(sm, &buf, bounding_span);
397398
// if the replacement already ends with a newline, don't print the next line
398399
if !buf.ends_with('\n') {
399400
push_trailing(&mut buf, prev_line.as_ref(), &prev_hi, None);

Diff for: ‎compiler/rustc_expand/src/base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ pub fn expr_to_spanned_string<'a>(
12661266
);
12671267
Some((err, true))
12681268
}
1269-
Ok(ast::LitKind::Err) => None,
1269+
Ok(ast::LitKind::Err(_)) => None,
12701270
Err(err) => {
12711271
report_lit_error(&cx.sess.parse_sess, err, token_lit, expr.span);
12721272
None

Diff for: ‎compiler/rustc_expand/src/proc_macro_server.rs

+18-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_ast::util::literal::escape_byte_str_symbol;
1010
use rustc_ast_pretty::pprust;
1111
use rustc_data_structures::fx::FxHashMap;
1212
use rustc_data_structures::sync::Lrc;
13-
use rustc_errors::{MultiSpan, PResult};
13+
use rustc_errors::{ErrorGuaranteed, MultiSpan, PResult};
1414
use rustc_parse::lexer::nfc_normalize;
1515
use rustc_parse::parse_stream_from_source_str;
1616
use rustc_session::parse::ParseSess;
@@ -63,7 +63,12 @@ impl FromInternal<token::LitKind> for LitKind {
6363
token::ByteStrRaw(n) => LitKind::ByteStrRaw(n),
6464
token::CStr => LitKind::CStr,
6565
token::CStrRaw(n) => LitKind::CStrRaw(n),
66-
token::Err => LitKind::Err,
66+
token::Err(_guar) => {
67+
// This is the only place a `pm::bridge::LitKind::ErrWithGuar`
68+
// is constructed. Note that an `ErrorGuaranteed` is available,
69+
// as required. See the comment in `to_internal`.
70+
LitKind::ErrWithGuar
71+
}
6772
token::Bool => unreachable!(),
6873
}
6974
}
@@ -82,7 +87,16 @@ impl ToInternal<token::LitKind> for LitKind {
8287
LitKind::ByteStrRaw(n) => token::ByteStrRaw(n),
8388
LitKind::CStr => token::CStr,
8489
LitKind::CStrRaw(n) => token::CStrRaw(n),
85-
LitKind::Err => token::Err,
90+
LitKind::ErrWithGuar => {
91+
// This is annoying but valid. `LitKind::ErrWithGuar` would
92+
// have an `ErrorGuaranteed` except that type isn't available
93+
// in that crate. So we have to fake one. And we don't want to
94+
// use a delayed bug because there might be lots of these,
95+
// which would be expensive.
96+
#[allow(deprecated)]
97+
let guar = ErrorGuaranteed::unchecked_error_guaranteed();
98+
token::Err(guar)
99+
}
86100
}
87101
}
88102
}
@@ -477,7 +491,7 @@ impl server::FreeFunctions for Rustc<'_, '_> {
477491
| token::LitKind::ByteStrRaw(_)
478492
| token::LitKind::CStr
479493
| token::LitKind::CStrRaw(_)
480-
| token::LitKind::Err => return Err(()),
494+
| token::LitKind::Err(_) => return Err(()),
481495
token::LitKind::Integer | token::LitKind::Float => {}
482496
}
483497

Diff for: ‎compiler/rustc_hir_analysis/src/lib.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,9 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
178178
let _ = tcx.ensure().coherent_trait(trait_def_id);
179179
}
180180
// these queries are executed for side-effects (error reporting):
181-
res.and(tcx.ensure().crate_inherent_impls(()))
182-
.and(tcx.ensure().crate_inherent_impls_overlap_check(()))
181+
let _ = tcx.ensure().crate_inherent_impls(());
182+
let _ = tcx.ensure().crate_inherent_impls_overlap_check(());
183+
res
183184
})?;
184185

185186
if tcx.features().rustc_attrs {

Diff for: ‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
13191319
tcx.type_of(tcx.require_lang_item(hir::LangItem::CStr, Some(lit.span)))
13201320
.skip_binder(),
13211321
),
1322-
ast::LitKind::Err => Ty::new_misc_error(tcx),
1322+
ast::LitKind::Err(guar) => Ty::new_error(tcx, guar),
13231323
}
13241324
}
13251325

Diff for: ‎compiler/rustc_lint/src/reference_casting.rs

+7
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,13 @@ fn is_cast_to_bigger_memory_layout<'tcx>(
207207
}
208208

209209
let from_layout = cx.layout_of(*inner_start_ty).ok()?;
210+
211+
// if the type isn't sized, we bail out, instead of potentially giving
212+
// the user a meaningless warning.
213+
if from_layout.is_unsized() {
214+
return None;
215+
}
216+
210217
let alloc_layout = cx.layout_of(alloc_ty).ok()?;
211218
let to_layout = cx.layout_of(*inner_end_ty).ok()?;
212219

Diff for: ‎compiler/rustc_mir_build/src/build/expr/as_constant.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,7 @@ fn lit_to_mir_constant<'tcx>(
164164
})?,
165165
(ast::LitKind::Bool(b), ty::Bool) => ConstValue::Scalar(Scalar::from_bool(*b)),
166166
(ast::LitKind::Char(c), ty::Char) => ConstValue::Scalar(Scalar::from_char(*c)),
167-
(ast::LitKind::Err, _) => {
168-
return Err(LitToConstError::Reported(
169-
tcx.dcx().delayed_bug("encountered LitKind::Err during mir build"),
170-
));
171-
}
167+
(ast::LitKind::Err(guar), _) => return Err(LitToConstError::Reported(*guar)),
172168
_ => return Err(LitToConstError::TypeError),
173169
};
174170

0 commit comments

Comments
 (0)