Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 5 pull requests #116901

Closed
wants to merge 10 commits into from
Closed

Rollup of 5 pull requests #116901

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
97d162a
Don't ICE when encountering unresolved regions in fully_resolve
compiler-errors Oct 12, 2023
e8857d0
Avoid having `rustc_smir` depend on `rustc_interface` or `rustc_driver`
oli-obk Oct 17, 2023
54eef16
Change my name in mailmap
blyxyas Oct 18, 2023
c1c5a1d
Only check in a single place if a pass is enabled.
cjgillot Oct 18, 2023
973d589
Bump COINDUCTIVE_OVERLAP_IN_COHERENCE
compiler-errors Oct 6, 2023
b6754a7
Rollup merge of #116493 - compiler-errors:coinductive-cycle-lint, r=lcnr
matthiaskrgr Oct 18, 2023
7dc3982
Rollup merge of #116663 - compiler-errors:resolve-regions, r=lcnr
matthiaskrgr Oct 18, 2023
1960cd9
Rollup merge of #116837 - oli-obk:smir_run_macro, r=spastorino
matthiaskrgr Oct 18, 2023
72b9b47
Rollup merge of #116883 - blyxyas:fix-mailmap, r=Nilstrieb
matthiaskrgr Oct 18, 2023
a76ab3e
Rollup merge of #116896 - cjgillot:single-inline, r=oli-obk
matthiaskrgr Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump COINDUCTIVE_OVERLAP_IN_COHERENCE
  • Loading branch information
@compiler-errors
compiler-errors committed Oct 18, 2023
commit 973d5895829e424e9a8df9cf4de08682760752c8
4 changes: 2 additions & 2 deletions compiler/rustc_lint_defs/src/builtin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4449,11 +4449,11 @@ declare_lint! {
/// on itself), the blanket impl is not considered to hold for `u8`. This will
/// change in a future release.
pub COINDUCTIVE_OVERLAP_IN_COHERENCE,
Warn,
Deny,
"impls that are not considered to overlap may be considered to \
overlap in the future",
@future_incompatible = FutureIncompatibleInfo {
reason: FutureIncompatibilityReason::FutureReleaseErrorDontReportInDeps,
reason: FutureIncompatibilityReason::FutureReleaseErrorReportInDeps,
reference: "issue #114040 <https://github.com/rust-lang/rust/issues/114040>",
};
}
Expand Down
25 changes: 25 additions & 0 deletions tests/ui/coherence/warn-when-cycle-is-error-in-coherence.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,28 @@ LL | #![deny(coinductive_overlap_in_coherence)]

error: aborting due to previous error

Future incompatibility report: Future breakage diagnostic:
error: implementations of `PartialEq<Interval<_>>` for `Interval<_>` will conflict in the future
--> $DIR/warn-when-cycle-is-error-in-coherence.rs:13:1
|
LL | #[derive(PartialEq, Default)]
| --------- the second impl is here
...
LL | / impl<T, Q> PartialEq<Q> for Interval<T>
LL | |
LL | |
LL | | where
LL | | T: Borrow<Q>,
LL | | Q: ?Sized + PartialOrd,
| |___________________________^ the first impl is here
|
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= note: for more information, see issue #114040 <https://github.com/rust-lang/rust/issues/114040>
= note: impls that are not considered to overlap may be considered to overlap in the future
= note: `Interval<_>: PartialOrd` may be considered to hold in future releases, causing the impls to overlap
note: the lint level is defined here
--> $DIR/warn-when-cycle-is-error-in-coherence.rs:1:9
|
LL | #![deny(coinductive_overlap_in_coherence)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Loading