diff options
| author | bors <bors@rust-lang.org> | 2024-01-09 09:20:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-09 09:20:33 +0000 |
| commit | be00c5a9b89161b7f45ba80340f709e8e41122f9 (patch) | |
| tree | 0f0d5c14cd352eb9a9b6d6a39434a2f50186827f /tests | |
| parent | dc641039d2b3f5c0894694e4b45f7c3951030685 (diff) | |
| parent | 707c4f967e4d6c68252eb784844a10a3613bde61 (diff) | |
| download | rust-be00c5a9b89161b7f45ba80340f709e8e41122f9.tar.gz rust-be00c5a9b89161b7f45ba80340f709e8e41122f9.zip | |
Auto merge of #118968 - aliemjay:canon-static, r=lcnr
unify query canonicalization mode Exclude from canonicalization only the static lifetimes that appear in the param env because of #118965 . Any other occurrence can be canonicalized safely AFAICT. r? `@lcnr`
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ui/higher-ranked/trait-bounds/hrtb-cache-issue-54302.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/higher-ranked/trait-bounds/issue-59311.stderr | 2 | ||||
| -rw-r--r-- | tests/ui/nll/issue-54302.stderr | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/ui/higher-ranked/trait-bounds/hrtb-cache-issue-54302.stderr b/tests/ui/higher-ranked/trait-bounds/hrtb-cache-issue-54302.stderr index 7f81ee331bf..186af160d90 100644 --- a/tests/ui/higher-ranked/trait-bounds/hrtb-cache-issue-54302.stderr +++ b/tests/ui/higher-ranked/trait-bounds/hrtb-cache-issue-54302.stderr @@ -4,7 +4,7 @@ error: implementation of `Deserialize` is not general enough LL | assert_deserialize_owned::<&'static str>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `Deserialize` is not general enough | - = note: `&'static str` must implement `Deserialize<'0>`, for any lifetime `'0`... + = note: `&str` must implement `Deserialize<'0>`, for any lifetime `'0`... = note: ...but `&str` actually implements `Deserialize<'1>`, for some specific lifetime `'1` error: aborting due to 1 previous error diff --git a/tests/ui/higher-ranked/trait-bounds/issue-59311.stderr b/tests/ui/higher-ranked/trait-bounds/issue-59311.stderr index 28c259be35f..e50aad876d8 100644 --- a/tests/ui/higher-ranked/trait-bounds/issue-59311.stderr +++ b/tests/ui/higher-ranked/trait-bounds/issue-59311.stderr @@ -12,7 +12,7 @@ error: higher-ranked lifetime error LL | v.t(|| {}); | ^^^^^ | - = note: could not prove `for<'a> &'a V: 'static` + = note: could not prove `for<'a> &'a V: 'b` error: aborting due to 2 previous errors diff --git a/tests/ui/nll/issue-54302.stderr b/tests/ui/nll/issue-54302.stderr index 269739af602..a1e2d401429 100644 --- a/tests/ui/nll/issue-54302.stderr +++ b/tests/ui/nll/issue-54302.stderr @@ -4,7 +4,7 @@ error: implementation of `Deserialize` is not general enough LL | assert_deserialize_owned::<&'static str>(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ implementation of `Deserialize` is not general enough | - = note: `&'static str` must implement `Deserialize<'0>`, for any lifetime `'0`... + = note: `&str` must implement `Deserialize<'0>`, for any lifetime `'0`... = note: ...but `&str` actually implements `Deserialize<'1>`, for some specific lifetime `'1` error: aborting due to 1 previous error |