Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ec94480

Browse files
borsbors
committedDec 5, 2023
Auto merge of #118646 - matthiaskrgr:rollup-jnscl9z, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #117922 (Tweak unclosed generics errors) - #118471 (Fix typos in README.md) - #118594 (Remove mention of rust to make the error message generic.) - #118598 (Remove the `precise_pointer_size_matching` feature gate) - #118606 (Fix `x` not to quit after `x` prints `settings.json`) - #118608 (Use default params until effects in desugaring) - #118614 (Update books) - #118637 (rustc_symbol_mangling,rustc_interface,rustc_driver_impl: Enforce `rustc::potential_query_instability` lint) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 8a7b203 + d367db2 commit ec94480

37 files changed

+163
-154
lines changed
 

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ If you wish to _contribute_ to the compiler, you should read
1212
[CONTRIBUTING.md](CONTRIBUTING.md) instead.
1313

1414
<details>
15-
<summary>Table of content</summary>
15+
<summary>Table of Contents</summary>
1616

1717
- [Quick Start](#quick-start)
1818
- [Installing from Source](#installing-from-source)

‎compiler/rustc_driver_impl/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#![feature(let_chains)]
1414
#![feature(panic_update_hook)]
1515
#![recursion_limit = "256"]
16-
#![allow(rustc::potential_query_instability)]
1716
#![deny(rustc::untranslatable_diagnostic)]
1817
#![deny(rustc::diagnostic_outside_of_impl)]
1918

‎compiler/rustc_feature/src/removed.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ declare_features! (
158158
/// Allows using `#[plugin_registrar]` on functions.
159159
(removed, plugin_registrar, "1.54.0", Some(29597), None,
160160
Some("plugins are no longer supported")),
161+
/// Allows exhaustive integer pattern matching with `usize::MAX`/`isize::MIN`/`isize::MAX`.
162+
(removed, precise_pointer_size_matching, "1.32.0", Some(56354), None,
163+
Some("removed in favor of half-open ranges")),
161164
(removed, proc_macro_expr, "1.27.0", Some(54727), None,
162165
Some("subsumed by `#![feature(proc_macro_hygiene)]`")),
163166
(removed, proc_macro_gen, "1.27.0", Some(54727), None,

‎compiler/rustc_feature/src/unstable.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,8 +543,6 @@ declare_features! (
543543
(unstable, offset_of_enum, "1.75.0", Some(106655), None),
544544
/// Allows using `#[optimize(X)]`.
545545
(unstable, optimize_attribute, "1.34.0", Some(54882), None),
546-
/// Allows exhaustive integer pattern matching on `usize` and `isize`.
547-
(unstable, precise_pointer_size_matching, "1.32.0", Some(56354), None),
548546
/// Allows macro attributes on expressions, statements and non-inline modules.
549547
(unstable, proc_macro_hygiene, "1.30.0", Some(54727), None),
550548
/// Allows `&raw const $place_expr` and `&raw mut $place_expr` expressions.

‎compiler/rustc_hir_analysis/src/astconv/generics.rs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,31 @@ pub fn create_args_for_parent_generic_args<'tcx, 'a>(
243243
match (args_iter.peek(), params.peek()) {
244244
(Some(&arg), Some(&param)) => {
245245
match (arg, &param.kind, arg_count.explicit_late_bound) {
246+
(
247+
GenericArg::Const(hir::ConstArg {
248+
is_desugared_from_effects: true,
249+
..
250+
}),
251+
GenericParamDefKind::Const { is_host_effect: false, .. }
252+
| GenericParamDefKind::Type { .. }
253+
| GenericParamDefKind::Lifetime,
254+
_,
255+
) => {
256+
// SPECIAL CASE FOR DESUGARED EFFECT PARAMS
257+
// This comes from the following example:
258+
//
259+
// ```
260+
// #[const_trait]
261+
// pub trait PartialEq<Rhs: ?Sized = Self> {}
262+
// impl const PartialEq for () {}
263+
// ```
264+
//
265+
// Since this is a const impl, we need to insert `<false>` at the end of
266+
// `PartialEq`'s generics, but this errors since `Rhs` isn't specified.
267+
// To work around this, we infer all arguments until we reach the host param.
268+
args.push(ctx.inferred_kind(Some(&args), param, infer_args));
269+
params.next();
270+
}
246271
(GenericArg::Lifetime(_), GenericParamDefKind::Lifetime, _)
247272
| (
248273
GenericArg::Type(_) | GenericArg::Infer(_),

‎compiler/rustc_interface/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#![feature(let_chains)]
77
#![feature(try_blocks)]
88
#![recursion_limit = "256"]
9-
#![allow(rustc::potential_query_instability)]
109
#![deny(rustc::untranslatable_diagnostic)]
1110
#![deny(rustc::diagnostic_outside_of_impl)]
1211

‎compiler/rustc_interface/src/passes.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,8 @@ fn early_lint_checks(tcx: TyCtxt<'_>, (): ()) {
306306

307307
// Gate identifiers containing invalid Unicode codepoints that were recovered during lexing.
308308
sess.parse_sess.bad_unicode_identifiers.with_lock(|identifiers| {
309+
// We will soon sort, so the initial order does not matter.
310+
#[allow(rustc::potential_query_instability)]
309311
let mut identifiers: Vec<_> = identifiers.drain().collect();
310312
identifiers.sort_by_key(|&(key, _)| key);
311313
for (ident, mut spans) in identifiers.into_iter() {
@@ -431,6 +433,9 @@ fn write_out_deps(tcx: TyCtxt<'_>, outputs: &OutputFilenames, out_filenames: &[P
431433
escape_dep_filename(&file.prefer_local().to_string())
432434
};
433435

436+
// The entries will be used to declare dependencies beween files in a
437+
// Makefile-like output, so the iteration order does not matter.
438+
#[allow(rustc::potential_query_instability)]
434439
let extra_tracked_files =
435440
file_depinfo.iter().map(|path_sym| normalize_path(PathBuf::from(path_sym.as_str())));
436441
files.extend(extra_tracked_files);
@@ -486,6 +491,8 @@ fn write_out_deps(tcx: TyCtxt<'_>, outputs: &OutputFilenames, out_filenames: &[P
486491
// Emit special comments with information about accessed environment variables.
487492
let env_depinfo = sess.parse_sess.env_depinfo.borrow();
488493
if !env_depinfo.is_empty() {
494+
// We will soon sort, so the initial order does not matter.
495+
#[allow(rustc::potential_query_instability)]
489496
let mut envs: Vec<_> = env_depinfo
490497
.iter()
491498
.map(|(k, v)| (escape_dep_env(*k), v.map(escape_dep_env)))

‎compiler/rustc_mir_build/src/thir/pattern/check_match.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -867,12 +867,6 @@ fn report_non_exhaustive_match<'p, 'tcx>(
867867
exhaustively",
868868
));
869869
}
870-
if cx.tcx.sess.is_nightly_build() {
871-
err.help(format!(
872-
"add `#![feature(precise_pointer_size_matching)]` to the crate attributes to \
873-
enable precise `{ty}` matching",
874-
));
875-
}
876870
} else if ty == cx.tcx.types.str_ {
877871
err.note("`&str` cannot be matched exhaustively, so a wildcard `_` is necessary");
878872
} else if cx.is_foreign_non_exhaustive_enum(ty) {

‎compiler/rustc_mir_build/src/thir/pattern/deconstruct_pat.rs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,7 @@ impl IntRange {
326326
/// `NegInfinity..PosInfinity`. In other words, as far as `IntRange` is concerned, there are
327327
/// values before `isize::MIN` and after `usize::MAX`/`isize::MAX`.
328328
/// This is to avoid e.g. `0..(u32::MAX as usize)` from being exhaustive on one architecture and
329-
/// not others. See discussions around the `precise_pointer_size_matching` feature for more
330-
/// details.
329+
/// not others. This was decided in <https://github.com/rust-lang/rfcs/pull/2591>.
331330
///
332331
/// These infinities affect splitting subtly: it is possible to get `NegInfinity..0` and
333332
/// `usize::MAX+1..PosInfinity` in the output. Diagnostics must be careful to handle these
@@ -380,7 +379,7 @@ impl IntRange {
380379
/// Whether the range denotes the fictitious values before `isize::MIN` or after
381380
/// `usize::MAX`/`isize::MAX` (see doc of [`IntRange::split`] for why these exist).
382381
pub(crate) fn is_beyond_boundaries<'tcx>(&self, ty: Ty<'tcx>, tcx: TyCtxt<'tcx>) -> bool {
383-
ty.is_ptr_sized_integral() && !tcx.features().precise_pointer_size_matching && {
382+
ty.is_ptr_sized_integral() && {
384383
// The two invalid ranges are `NegInfinity..isize::MIN` (represented as
385384
// `NegInfinity..0`), and `{u,i}size::MAX+1..PosInfinity`. `to_diagnostic_pat_range_bdy`
386385
// converts `MAX+1` to `PosInfinity`, and we couldn't have `PosInfinity` in `self.lo`
@@ -941,11 +940,8 @@ impl ConstructorSet {
941940
}
942941
}
943942
&ty::Int(ity) => {
944-
let range = if ty.is_ptr_sized_integral()
945-
&& !cx.tcx.features().precise_pointer_size_matching
946-
{
947-
// The min/max values of `isize` are not allowed to be observed unless the
948-
// `precise_pointer_size_matching` feature is enabled.
943+
let range = if ty.is_ptr_sized_integral() {
944+
// The min/max values of `isize` are not allowed to be observed.
949945
IntRange { lo: NegInfinity, hi: PosInfinity }
950946
} else {
951947
let bits = Integer::from_int_ty(&cx.tcx, ity).size().bits() as u128;
@@ -956,11 +952,8 @@ impl ConstructorSet {
956952
Self::Integers { range_1: range, range_2: None }
957953
}
958954
&ty::Uint(uty) => {
959-
let range = if ty.is_ptr_sized_integral()
960-
&& !cx.tcx.features().precise_pointer_size_matching
961-
{
962-
// The max value of `usize` is not allowed to be observed unless the
963-
// `precise_pointer_size_matching` feature is enabled.
955+
let range = if ty.is_ptr_sized_integral() {
956+
// The max value of `usize` is not allowed to be observed.
964957
let lo = MaybeInfiniteInt::new_finite(cx.tcx, ty, 0);
965958
IntRange { lo, hi: PosInfinity }
966959
} else {

‎compiler/rustc_parse/src/parser/diagnostics.rs

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -673,15 +673,6 @@ impl<'a> Parser<'a> {
673673
);
674674
}
675675

676-
// Add suggestion for a missing closing angle bracket if '>' is included in expected_tokens
677-
// there are unclosed angle brackets
678-
if self.unmatched_angle_bracket_count > 0
679-
&& self.token.kind == TokenKind::Eq
680-
&& expected.iter().any(|tok| matches!(tok, TokenType::Token(TokenKind::Gt)))
681-
{
682-
err.span_label(self.prev_token.span, "maybe try to close unmatched angle bracket");
683-
}
684-
685676
let sp = if self.token == token::Eof {
686677
// This is EOF; don't want to point at the following char, but rather the last token.
687678
self.prev_token.span
@@ -811,6 +802,7 @@ impl<'a> Parser<'a> {
811802
}
812803
err.emit();
813804
}
805+
814806
fn check_too_many_raw_str_terminators(&mut self, err: &mut Diagnostic) -> bool {
815807
let sm = self.sess.source_map();
816808
match (&self.prev_token.kind, &self.token.kind) {
@@ -1986,6 +1978,39 @@ impl<'a> Parser<'a> {
19861978
}
19871979
}
19881980

1981+
/// When trying to close a generics list and encountering code like
1982+
/// ```text
1983+
/// impl<S: Into<std::borrow::Cow<'static, str>> From<S> for Canonical {}
1984+
/// // ^ missing > here
1985+
/// ```
1986+
/// we provide a structured suggestion on the error from `expect_gt`.
1987+
pub(super) fn expect_gt_or_maybe_suggest_closing_generics(
1988+
&mut self,
1989+
params: &[ast::GenericParam],
1990+
) -> PResult<'a, ()> {
1991+
let Err(mut err) = self.expect_gt() else {
1992+
return Ok(());
1993+
};
1994+
// Attempt to find places where a missing `>` might belong.
1995+
if let [.., ast::GenericParam { bounds, .. }] = params
1996+
&& let Some(poly) = bounds
1997+
.iter()
1998+
.filter_map(|bound| match bound {
1999+
ast::GenericBound::Trait(poly, _) => Some(poly),
2000+
_ => None,
2001+
})
2002+
.last()
2003+
{
2004+
err.span_suggestion_verbose(
2005+
poly.span.shrink_to_hi(),
2006+
"you might have meant to end the type parameters here",
2007+
">",
2008+
Applicability::MaybeIncorrect,
2009+
);
2010+
}
2011+
Err(err)
2012+
}
2013+
19892014
pub(super) fn recover_seq_parse_error(
19902015
&mut self,
19912016
delim: Delimiter,

‎compiler/rustc_parse/src/parser/generics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ impl<'a> Parser<'a> {
279279
let span_lo = self.token.span;
280280
let (params, span) = if self.eat_lt() {
281281
let params = self.parse_generic_params()?;
282-
self.expect_gt()?;
282+
self.expect_gt_or_maybe_suggest_closing_generics(&params)?;
283283
(params, span_lo.to(self.prev_token.span))
284284
} else {
285285
(ThinVec::new(), self.prev_token.span.shrink_to_hi())

‎compiler/rustc_symbol_mangling/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
#![allow(internal_features)]
9494
#![feature(never_type)]
9595
#![recursion_limit = "256"]
96-
#![allow(rustc::potential_query_instability)]
9796
#![deny(rustc::untranslatable_diagnostic)]
9897
#![deny(rustc::diagnostic_outside_of_impl)]
9998

‎src/bootstrap/src/core/build_steps/setup.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -549,12 +549,13 @@ impl Step for Vscode {
549549
if config.dry_run() {
550550
return;
551551
}
552-
t!(create_vscode_settings_maybe(&config));
552+
while !t!(create_vscode_settings_maybe(&config)) {}
553553
}
554554
}
555555

556556
/// Create a `.vscode/settings.json` file for rustc development, or just print it
557-
fn create_vscode_settings_maybe(config: &Config) -> io::Result<()> {
557+
/// If this method should be re-called, it returns `false`.
558+
fn create_vscode_settings_maybe(config: &Config) -> io::Result<bool> {
558559
let (current_hash, historical_hashes) = SETTINGS_HASHES.split_last().unwrap();
559560
let vscode_settings = config.src.join(".vscode").join("settings.json");
560561
// If None, no settings.json exists
@@ -567,7 +568,7 @@ fn create_vscode_settings_maybe(config: &Config) -> io::Result<()> {
567568
hasher.update(&current);
568569
let hash = hex::encode(hasher.finalize().as_slice());
569570
if hash == *current_hash {
570-
return Ok(());
571+
return Ok(true);
571572
} else if historical_hashes.contains(&hash.as_str()) {
572573
mismatched_settings = Some(true);
573574
} else {
@@ -587,13 +588,13 @@ fn create_vscode_settings_maybe(config: &Config) -> io::Result<()> {
587588
_ => (),
588589
}
589590
let should_create = match prompt_user(
590-
"Would you like to create/update `settings.json`, or only print suggested settings?: [y/p/N]",
591+
"Would you like to create/update settings.json? (Press 'p' to preview values): [y/N]",
591592
)? {
592593
Some(PromptResult::Yes) => true,
593594
Some(PromptResult::Print) => false,
594595
_ => {
595596
println!("Ok, skipping settings!");
596-
return Ok(());
597+
return Ok(true);
597598
}
598599
};
599600
if should_create {
@@ -620,5 +621,5 @@ fn create_vscode_settings_maybe(config: &Config) -> io::Result<()> {
620621
} else {
621622
println!("\n{RUST_ANALYZER_SETTINGS}");
622623
}
623-
Ok(())
624+
Ok(should_create)
624625
}

‎src/doc/nomicon

‎src/librustdoc/html/render/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ fn short_item_info(
673673
format!("Deprecating in {version}")
674674
}
675675
}
676-
DeprecatedSince::Future => String::from("Deprecating in a future Rust version"),
676+
DeprecatedSince::Future => String::from("Deprecating in a future version"),
677677
DeprecatedSince::NonStandard(since) => {
678678
format!("Deprecated since {}", Escape(since.as_str()))
679679
}

‎tests/rustdoc/deprecated-future-staged-api.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub struct S1;
1212
// @has deprecated_future_staged_api/index.html '//*[@class="stab deprecated"]' \
1313
// 'Deprecation planned'
1414
// @has deprecated_future_staged_api/struct.S2.html '//*[@class="stab deprecated"]' \
15-
// 'Deprecating in a future Rust version: literally never'
15+
// 'Deprecating in a future version: literally never'
1616
#[deprecated(since = "TBD", note = "literally never")]
1717
#[stable(feature = "deprecated_future_staged_api", since = "1.0.0")]
1818
pub struct S2;

‎tests/ui/feature-gates/feature-gate-precise_pointer_size_matching.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LL | match 0usize {
66
|
77
= note: the matched value is of type `usize`
88
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
9-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
109
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
1110
|
1211
LL ~ 0..=usize::MAX => {},
@@ -21,7 +20,6 @@ LL | match 0isize {
2120
|
2221
= note: the matched value is of type `isize`
2322
= note: `isize` does not have fixed minimum and maximum values, so half-open ranges are necessary to match exhaustively
24-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `isize` matching
2523
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
2624
|
2725
LL ~ isize::MIN..=isize::MAX => {},

‎tests/ui/generic-associated-types/parse/trait-path-expected-token.stderr

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ error: expected one of `!`, `(`, `+`, `,`, `::`, `<`, or `>`, found `=`
22
--> $DIR/trait-path-expected-token.rs:5:33
33
|
44
LL | fn f1<'a>(arg : Box<dyn X<Y = B = &'a ()>>) {}
5-
| - ^ expected one of 7 possible tokens
6-
| |
7-
| maybe try to close unmatched angle bracket
5+
| ^ expected one of 7 possible tokens
86

97
error: aborting due to 1 previous error
108

‎tests/ui/generic-associated-types/parse/trait-path-expressions.stderr

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ error: expected one of `,`, `:`, or `>`, found `=`
1010
--> $DIR/trait-path-expressions.rs:16:36
1111
|
1212
LL | fn f2<'a>(arg : Box<dyn X< { 1 } = 32 >>) {}
13-
| - ^ expected one of `,`, `:`, or `>`
14-
| |
15-
| maybe try to close unmatched angle bracket
13+
| ^ expected one of `,`, `:`, or `>`
1614
|
1715
help: you might have meant to end the type parameters here
1816
|

‎tests/ui/generic-associated-types/parse/trait-path-missing-gen_arg.stderr

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ error: expected one of `>`, a const expression, lifetime, or type, found `=`
88
--> $DIR/trait-path-missing-gen_arg.rs:11:30
99
|
1010
LL | fn f1<'a>(arg : Box<dyn X< = 32 >>) {}
11-
| - ^ expected one of `>`, a const expression, lifetime, or type
12-
| |
13-
| maybe try to close unmatched angle bracket
11+
| ^ expected one of `>`, a const expression, lifetime, or type
1412

1513
error: aborting due to 2 previous errors
1614

‎tests/ui/generic-associated-types/parse/trait-path-segments.stderr

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ error: expected one of `!`, `(`, `+`, `,`, `::`, `:`, `<`, or `>`, found `=`
22
--> $DIR/trait-path-segments.rs:6:36
33
|
44
LL | fn f1<'a>(arg : Box<dyn X<X::Y = u32>>) {}
5-
| - ^ expected one of 8 possible tokens
6-
| |
7-
| maybe try to close unmatched angle bracket
5+
| ^ expected one of 8 possible tokens
86
|
97
help: you might have meant to end the type parameters here
108
|
@@ -15,9 +13,7 @@ error: expected one of `,`, `::`, `:`, or `>`, found `=`
1513
--> $DIR/trait-path-segments.rs:17:35
1614
|
1715
LL | impl<T : X<<Self as X>::Y<'a> = &'a u32>> Z for T {}
18-
| - ^ expected one of `,`, `::`, `:`, or `>`
19-
| |
20-
| maybe try to close unmatched angle bracket
16+
| ^ expected one of `,`, `::`, `:`, or `>`
2117
|
2218
help: you might have meant to end the type parameters here
2319
|
@@ -28,9 +24,7 @@ error: expected one of `!`, `+`, `,`, `::`, `:`, or `>`, found `=`
2824
--> $DIR/trait-path-segments.rs:28:25
2925
|
3026
LL | impl<T : X<X::Y<'a> = &'a u32>> Z for T {}
31-
| - ^ expected one of `!`, `+`, `,`, `::`, `:`, or `>`
32-
| |
33-
| maybe try to close unmatched angle bracket
27+
| ^ expected one of `!`, `+`, `,`, `::`, `:`, or `>`
3428
|
3529
help: you might have meant to end the type parameters here
3630
|

‎tests/ui/generic-associated-types/parse/trait-path-types.stderr

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ error: expected one of `,`, `:`, or `>`, found `=`
22
--> $DIR/trait-path-types.rs:6:37
33
|
44
LL | fn f<'a>(arg : Box<dyn X< [u8; 1] = u32>>) {}
5-
| - ^ expected one of `,`, `:`, or `>`
6-
| |
7-
| maybe try to close unmatched angle bracket
5+
| ^ expected one of `,`, `:`, or `>`
86
|
97
help: you might have meant to end the type parameters here
108
|
@@ -15,9 +13,7 @@ error: expected one of `,`, `:`, or `>`, found `=`
1513
--> $DIR/trait-path-types.rs:11:37
1614
|
1715
LL | fn f1<'a>(arg : Box<dyn X<(Y<'a>) = &'a ()>>) {}
18-
| - ^ expected one of `,`, `:`, or `>`
19-
| |
20-
| maybe try to close unmatched angle bracket
16+
| ^ expected one of `,`, `:`, or `>`
2117
|
2218
help: you might have meant to end the type parameters here
2319
|
@@ -28,9 +24,7 @@ error: expected one of `,`, `:`, or `>`, found `=`
2824
--> $DIR/trait-path-types.rs:16:33
2925
|
3026
LL | fn f1<'a>(arg : Box<dyn X< 'a = u32 >>) {}
31-
| -- ^ expected one of `,`, `:`, or `>`
32-
| |
33-
| maybe try to close unmatched angle bracket
27+
| ^ expected one of `,`, `:`, or `>`
3428
|
3529
help: you might have meant to end the type parameters here
3630
|

‎tests/ui/generics/unclosed-generics-in-impl-def.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
impl<S: Into<std::borrow::Cow<'static, str>> From<S> for Canonical {} //~ ERROR expected
2+
fn main() {}

‎tests/ui/generics/unclosed-generics-in-impl-def.stderr

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error: expected one of `+`, `,`, `::`, `=`, or `>`, found `From`
2+
--> $DIR/unclosed-generics-in-impl-def.rs:1:46
3+
|
4+
LL | impl<S: Into<std::borrow::Cow<'static, str>> From<S> for Canonical {}
5+
| ^^^^ expected one of `+`, `,`, `::`, `=`, or `>`
6+
|
7+
help: you might have meant to end the type parameters here
8+
|
9+
LL | impl<S: Into<std::borrow::Cow<'static, str>>> From<S> for Canonical {}
10+
| +
11+
12+
error: aborting due to 1 previous error
13+

‎tests/ui/issues/issue-34334.stderr

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ error: expected one of `,`, `:`, or `>`, found `=`
22
--> $DIR/issue-34334.rs:2:29
33
|
44
LL | let sr: Vec<(u32, _, _) = vec![];
5-
| -- - ^ expected one of `,`, `:`, or `>`
6-
| | |
7-
| | maybe try to close unmatched angle bracket
5+
| -- ^ expected one of `,`, `:`, or `>`
6+
| |
87
| while parsing the type for `sr`
98
|
109
help: you might have meant to end the type parameters here

‎tests/ui/parser/missing-closing-angle-bracket-eq-constraint.stderr

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ error: expected one of `,`, `:`, or `>`, found `=`
22
--> $DIR/missing-closing-angle-bracket-eq-constraint.rs:7:23
33
|
44
LL | let v : Vec<(u32,_) = vec![];
5-
| - - ^ expected one of `,`, `:`, or `>`
6-
| | |
7-
| | maybe try to close unmatched angle bracket
5+
| - ^ expected one of `,`, `:`, or `>`
6+
| |
87
| while parsing the type for `v`
98
|
109
help: you might have meant to end the type parameters here
@@ -29,9 +28,8 @@ error: expected one of `,`, `:`, or `>`, found `=`
2928
--> $DIR/missing-closing-angle-bracket-eq-constraint.rs:18:18
3029
|
3130
LL | let v : Vec<'a = vec![];
32-
| - -- ^ expected one of `,`, `:`, or `>`
33-
| | |
34-
| | maybe try to close unmatched angle bracket
31+
| - ^ expected one of `,`, `:`, or `>`
32+
| |
3533
| while parsing the type for `v`
3634
|
3735
help: you might have meant to end the type parameters here

‎tests/ui/pattern/usefulness/integer-ranges/pointer-sized-int.allow.stderr

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎tests/ui/pattern/usefulness/integer-ranges/pointer-sized-int.deny.stderr

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,161 +1,150 @@
11
error[E0004]: non-exhaustive patterns: `usize::MAX..` not covered
2-
--> $DIR/pointer-sized-int.rs:14:11
2+
--> $DIR/pointer-sized-int.rs:13:11
33
|
44
LL | match 0usize {
55
| ^^^^^^ pattern `usize::MAX..` not covered
66
|
77
= note: the matched value is of type `usize`
88
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
9-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
109
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
1110
|
1211
LL ~ 0..=usize::MAX => {},
1312
LL + usize::MAX.. => todo!()
1413
|
1514

1615
error[E0004]: non-exhaustive patterns: `..isize::MIN` and `isize::MAX..` not covered
17-
--> $DIR/pointer-sized-int.rs:19:11
16+
--> $DIR/pointer-sized-int.rs:18:11
1817
|
1918
LL | match 0isize {
2019
| ^^^^^^ patterns `..isize::MIN` and `isize::MAX..` not covered
2120
|
2221
= note: the matched value is of type `isize`
2322
= note: `isize` does not have fixed minimum and maximum values, so half-open ranges are necessary to match exhaustively
24-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `isize` matching
2523
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
2624
|
2725
LL ~ isize::MIN..=isize::MAX => {},
2826
LL + ..isize::MIN | isize::MAX.. => todo!()
2927
|
3028

3129
error[E0004]: non-exhaustive patterns: `usize::MAX..` not covered
32-
--> $DIR/pointer-sized-int.rs:24:8
30+
--> $DIR/pointer-sized-int.rs:23:8
3331
|
3432
LL | m!(0usize, 0..=usize::MAX);
3533
| ^^^^^^ pattern `usize::MAX..` not covered
3634
|
3735
= note: the matched value is of type `usize`
3836
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
39-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
4037
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
4138
|
4239
LL | match $s { $($t)+ => {}, usize::MAX.. => todo!() }
4340
| +++++++++++++++++++++++++
4441

4542
error[E0004]: non-exhaustive patterns: `usize::MAX..` not covered
46-
--> $DIR/pointer-sized-int.rs:26:8
43+
--> $DIR/pointer-sized-int.rs:25:8
4744
|
4845
LL | m!(0usize, 0..5 | 5..=usize::MAX);
4946
| ^^^^^^ pattern `usize::MAX..` not covered
5047
|
5148
= note: the matched value is of type `usize`
5249
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
53-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
5450
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
5551
|
5652
LL | match $s { $($t)+ => {}, usize::MAX.. => todo!() }
5753
| +++++++++++++++++++++++++
5854

5955
error[E0004]: non-exhaustive patterns: `usize::MAX..` not covered
60-
--> $DIR/pointer-sized-int.rs:28:8
56+
--> $DIR/pointer-sized-int.rs:27:8
6157
|
6258
LL | m!(0usize, 0..usize::MAX | usize::MAX);
6359
| ^^^^^^ pattern `usize::MAX..` not covered
6460
|
6561
= note: the matched value is of type `usize`
6662
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
67-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
6863
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
6964
|
7065
LL | match $s { $($t)+ => {}, usize::MAX.. => todo!() }
7166
| +++++++++++++++++++++++++
7267

7368
error[E0004]: non-exhaustive patterns: `(usize::MAX.., _)` not covered
74-
--> $DIR/pointer-sized-int.rs:30:8
69+
--> $DIR/pointer-sized-int.rs:29:8
7570
|
7671
LL | m!((0usize, true), (0..5, true) | (5..=usize::MAX, true) | (0..=usize::MAX, false));
7772
| ^^^^^^^^^^^^^^ pattern `(usize::MAX.., _)` not covered
7873
|
7974
= note: the matched value is of type `(usize, bool)`
8075
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
81-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
8276
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
8377
|
8478
LL | match $s { $($t)+ => {}, (usize::MAX.., _) => todo!() }
8579
| ++++++++++++++++++++++++++++++
8680

8781
error[E0004]: non-exhaustive patterns: `..isize::MIN` and `isize::MAX..` not covered
88-
--> $DIR/pointer-sized-int.rs:39:8
82+
--> $DIR/pointer-sized-int.rs:38:8
8983
|
9084
LL | m!(0isize, isize::MIN..=isize::MAX);
9185
| ^^^^^^ patterns `..isize::MIN` and `isize::MAX..` not covered
9286
|
9387
= note: the matched value is of type `isize`
9488
= note: `isize` does not have fixed minimum and maximum values, so half-open ranges are necessary to match exhaustively
95-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `isize` matching
9689
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
9790
|
9891
LL | match $s { $($t)+ => {}, ..isize::MIN | isize::MAX.. => todo!() }
9992
| ++++++++++++++++++++++++++++++++++++++++
10093

10194
error[E0004]: non-exhaustive patterns: `..isize::MIN` and `isize::MAX..` not covered
102-
--> $DIR/pointer-sized-int.rs:41:8
95+
--> $DIR/pointer-sized-int.rs:40:8
10396
|
10497
LL | m!(0isize, isize::MIN..5 | 5..=isize::MAX);
10598
| ^^^^^^ patterns `..isize::MIN` and `isize::MAX..` not covered
10699
|
107100
= note: the matched value is of type `isize`
108101
= note: `isize` does not have fixed minimum and maximum values, so half-open ranges are necessary to match exhaustively
109-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `isize` matching
110102
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
111103
|
112104
LL | match $s { $($t)+ => {}, ..isize::MIN | isize::MAX.. => todo!() }
113105
| ++++++++++++++++++++++++++++++++++++++++
114106

115107
error[E0004]: non-exhaustive patterns: `..isize::MIN` and `isize::MAX..` not covered
116-
--> $DIR/pointer-sized-int.rs:43:8
108+
--> $DIR/pointer-sized-int.rs:42:8
117109
|
118110
LL | m!(0isize, isize::MIN..=-1 | 0 | 1..=isize::MAX);
119111
| ^^^^^^ patterns `..isize::MIN` and `isize::MAX..` not covered
120112
|
121113
= note: the matched value is of type `isize`
122114
= note: `isize` does not have fixed minimum and maximum values, so half-open ranges are necessary to match exhaustively
123-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `isize` matching
124115
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
125116
|
126117
LL | match $s { $($t)+ => {}, ..isize::MIN | isize::MAX.. => todo!() }
127118
| ++++++++++++++++++++++++++++++++++++++++
128119

129120
error[E0004]: non-exhaustive patterns: `..isize::MIN` and `isize::MAX..` not covered
130-
--> $DIR/pointer-sized-int.rs:45:8
121+
--> $DIR/pointer-sized-int.rs:44:8
131122
|
132123
LL | m!(0isize, isize::MIN..isize::MAX | isize::MAX);
133124
| ^^^^^^ patterns `..isize::MIN` and `isize::MAX..` not covered
134125
|
135126
= note: the matched value is of type `isize`
136127
= note: `isize` does not have fixed minimum and maximum values, so half-open ranges are necessary to match exhaustively
137-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `isize` matching
138128
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
139129
|
140130
LL | match $s { $($t)+ => {}, ..isize::MIN | isize::MAX.. => todo!() }
141131
| ++++++++++++++++++++++++++++++++++++++++
142132

143133
error[E0004]: non-exhaustive patterns: `(..isize::MIN, _)` and `(isize::MAX.., _)` not covered
144-
--> $DIR/pointer-sized-int.rs:48:9
134+
--> $DIR/pointer-sized-int.rs:47:9
145135
|
146136
LL | (0isize, true),
147137
| ^^^^^^^^^^^^^^ patterns `(..isize::MIN, _)` and `(isize::MAX.., _)` not covered
148138
|
149139
= note: the matched value is of type `(isize, bool)`
150140
= note: `isize` does not have fixed minimum and maximum values, so half-open ranges are necessary to match exhaustively
151-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `isize` matching
152141
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
153142
|
154143
LL | match $s { $($t)+ => {}, (..isize::MIN, _) | (isize::MAX.., _) => todo!() }
155144
| ++++++++++++++++++++++++++++++++++++++++++++++++++
156145

157146
error[E0004]: non-exhaustive patterns: type `usize` is non-empty
158-
--> $DIR/pointer-sized-int.rs:59:11
147+
--> $DIR/pointer-sized-int.rs:58:11
159148
|
160149
LL | match 7usize {}
161150
| ^^^^^^

‎tests/ui/pattern/usefulness/integer-ranges/pointer-sized-int.rs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// revisions: allow deny
1+
// revisions: deny
22
#![feature(exclusive_range_pattern)]
3-
#![cfg_attr(allow, feature(precise_pointer_size_matching))]
43
#![allow(overlapping_range_endpoints)]
54

65
macro_rules! m {
@@ -12,23 +11,23 @@ macro_rules! m {
1211
#[rustfmt::skip]
1312
fn main() {
1413
match 0usize {
15-
//[deny]~^ ERROR non-exhaustive patterns
14+
//~^ ERROR non-exhaustive patterns
1615
0..=usize::MAX => {}
1716
}
1817

1918
match 0isize {
20-
//[deny]~^ ERROR non-exhaustive patterns
19+
//~^ ERROR non-exhaustive patterns
2120
isize::MIN..=isize::MAX => {}
2221
}
2322

2423
m!(0usize, 0..=usize::MAX);
25-
//[deny]~^ ERROR non-exhaustive patterns
24+
//~^ ERROR non-exhaustive patterns
2625
m!(0usize, 0..5 | 5..=usize::MAX);
27-
//[deny]~^ ERROR non-exhaustive patterns
26+
//~^ ERROR non-exhaustive patterns
2827
m!(0usize, 0..usize::MAX | usize::MAX);
29-
//[deny]~^ ERROR non-exhaustive patterns
28+
//~^ ERROR non-exhaustive patterns
3029
m!((0usize, true), (0..5, true) | (5..=usize::MAX, true) | (0..=usize::MAX, false));
31-
//[deny]~^ ERROR non-exhaustive patterns
30+
//~^ ERROR non-exhaustive patterns
3231

3332
m!(0usize, 0..);
3433
m!(0usize, 0..5 | 5..);
@@ -37,18 +36,18 @@ fn main() {
3736
m!(0usize, 0..=usize::MAX | usize::MAX..);
3837

3938
m!(0isize, isize::MIN..=isize::MAX);
40-
//[deny]~^ ERROR non-exhaustive patterns
39+
//~^ ERROR non-exhaustive patterns
4140
m!(0isize, isize::MIN..5 | 5..=isize::MAX);
42-
//[deny]~^ ERROR non-exhaustive patterns
41+
//~^ ERROR non-exhaustive patterns
4342
m!(0isize, isize::MIN..=-1 | 0 | 1..=isize::MAX);
44-
//[deny]~^ ERROR non-exhaustive patterns
43+
//~^ ERROR non-exhaustive patterns
4544
m!(0isize, isize::MIN..isize::MAX | isize::MAX);
46-
//[deny]~^ ERROR non-exhaustive patterns
45+
//~^ ERROR non-exhaustive patterns
4746
m!(
4847
(0isize, true),
4948
(isize::MIN..5, true) | (5..=isize::MAX, true) | (isize::MIN..=isize::MAX, false)
5049
);
51-
//[deny]~^^^ ERROR non-exhaustive patterns
50+
//~^^^ ERROR non-exhaustive patterns
5251

5352
m!(0isize, ..0 | 0..);
5453
m!(0isize, ..5 | 5..);

‎tests/ui/pattern/usefulness/integer-ranges/precise_pointer_matching-message.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LL | match 0usize {
66
|
77
= note: the matched value is of type `usize`
88
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
9-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
109
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
1110
|
1211
LL ~ 0..=usize::MAX => {},
@@ -21,7 +20,6 @@ LL | match 0isize {
2120
|
2221
= note: the matched value is of type `isize`
2322
= note: `isize` does not have fixed minimum and maximum values, so half-open ranges are necessary to match exhaustively
24-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `isize` matching
2523
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
2624
|
2725
LL ~ isize::MIN..=isize::MAX => {},

‎tests/ui/pattern/usefulness/issue-85222-types-containing-non-exhaustive-types.stderr

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LL | match 0 {
66
|
77
= note: the matched value is of type `usize`
88
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
9-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
109
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
1110
|
1211
LL ~ 1..=usize::MAX => (),
@@ -21,7 +20,6 @@ LL | match (0usize, 0usize) {
2120
|
2221
= note: the matched value is of type `(usize, usize)`
2322
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
24-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
2523
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
2624
|
2725
LL ~ (1..=usize::MAX, 1..=usize::MAX) => (),
@@ -36,7 +34,6 @@ LL | match (0isize, 0usize) {
3634
|
3735
= note: the matched value is of type `(isize, usize)`
3836
= note: `isize` does not have fixed minimum and maximum values, so half-open ranges are necessary to match exhaustively
39-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `isize` matching
4037
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
4138
|
4239
LL ~ (isize::MIN..=isize::MAX, 1..=usize::MAX) => (),
@@ -74,7 +71,6 @@ note: `Option<usize>` defined here
7471
= note: not covered
7572
= note: the matched value is of type `Option<usize>`
7673
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
77-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
7874
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
7975
|
8076
LL ~ None => (),
@@ -98,7 +94,6 @@ note: `Option<Option<Option<usize>>>` defined here
9894
= note: not covered
9995
= note: the matched value is of type `Option<Option<Option<usize>>>`
10096
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
101-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
10297
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
10398
|
10499
LL ~ None => (),
@@ -118,7 +113,6 @@ LL | struct A<T> {
118113
| ^
119114
= note: the matched value is of type `A<usize>`
120115
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
121-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
122116
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
123117
|
124118
LL ~ A { a: 1..=usize::MAX } => (),
@@ -138,7 +132,6 @@ LL | struct B<T, U>(T, U);
138132
| ^
139133
= note: the matched value is of type `B<isize, usize>`
140134
= note: `isize` does not have fixed minimum and maximum values, so half-open ranges are necessary to match exhaustively
141-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `isize` matching
142135
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
143136
|
144137
LL ~ B(isize::MIN..=isize::MAX, 1..=usize::MAX) => (),
@@ -158,7 +151,6 @@ LL | struct B<T, U>(T, U);
158151
| ^
159152
= note: the matched value is of type `B<isize, usize>`
160153
= note: `usize` does not have a fixed maximum value, so half-open ranges are necessary to match exhaustively
161-
= help: add `#![feature(precise_pointer_size_matching)]` to the crate attributes to enable precise `usize` matching
162154
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
163155
|
164156
LL ~ B(_, 1..=usize::MAX) => (),

‎tests/ui/rfcs/rfc-2632-const-trait-impl/effects/effect-param-infer.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Ensure that we don't get a mismatch error when inserting the host param
2+
// at the end of generic args when the generics have defaulted params.
3+
//
4+
// check-pass
5+
6+
#![feature(const_trait_impl, effects)]
7+
8+
#[const_trait]
9+
pub trait Foo<Rhs: ?Sized = Self> {
10+
/* stuff */
11+
}
12+
13+
impl const Foo for () {}
14+
15+
fn main() {}

‎tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ trait Add<Rhs = Self> {
2121
fn add(self, rhs: Rhs) -> Self::Output;
2222
}
2323

24-
// FIXME(effects) we shouldn't need to have to specify `Rhs`.
25-
impl const Add<i32> for i32 {
24+
impl const Add for i32 {
2625
type Output = i32;
2726
fn add(self, rhs: i32) -> i32 {
2827
loop {}
@@ -353,8 +352,7 @@ where
353352
}
354353
}
355354

356-
// FIXME(effects): again, this should not error without Rhs specified
357-
impl PartialEq<str> for str {
355+
impl PartialEq for str {
358356
fn eq(&self, other: &str) -> bool {
359357
loop {}
360358
}

‎tests/ui/rfcs/rfc-2632-const-trait-impl/effects/minicore.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0493]: destructor of `Self` cannot be evaluated at compile-time
2-
--> $DIR/minicore.rs:503:9
2+
--> $DIR/minicore.rs:501:9
33
|
44
LL | *self = source.clone()
55
| ^^^^^
@@ -8,7 +8,7 @@ LL | *self = source.clone()
88
| value is dropped here
99

1010
error[E0493]: destructor of `T` cannot be evaluated at compile-time
11-
--> $DIR/minicore.rs:513:35
11+
--> $DIR/minicore.rs:511:35
1212
|
1313
LL | const fn drop<T: ~const Destruct>(_: T) {}
1414
| ^ - value is dropped here

0 commit comments

Comments
 (0)
Please sign in to comment.