Skip to content

reimplement ~const Trait bounds via a fourth kind of generic param #101900

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

Closed
wants to merge 13 commits into from
Closed

reimplement ~const Trait bounds via a fourth kind of generic param #101900

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
37f6e29
Introduce effect datastructure
oli-obk Sep 28, 2022
8f57f7a
In the transition period where not all operator traits are const_trai…
oli-obk Oct 2, 2022
1cd3a64
Add TypeFoldable impls for effects
oli-obk Sep 8, 2022
57ec943
Add Lift impls for `Effect`
oli-obk Sep 15, 2022
230f0ad
Add effect inference var unification table
oli-obk Sep 8, 2022
e523a95
Add effects to TypeRelation
oli-obk Sep 8, 2022
23f8475
Add effect generic param
oli-obk Sep 12, 2022
82f2130
Add GenericParamDefKind::Effect
oli-obk Sep 16, 2022
6d5c679
Add canonicalization for effects
oli-obk Sep 29, 2022
490c462
Fiddle HirId through a bunch of methods
oli-obk Oct 11, 2022
200b34d
Need to wait for derive_const to land on master before we can land ef…
oli-obk Nov 23, 2022
5da0201
Generate effects for const fns and const traits under the `effects` f…
oli-obk Oct 20, 2022
93b00a7
Add Callable trait for future simplification of const checks
oli-obk Nov 30, 2022
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
Need to wait for derive_const to land on master before we can land ef… 
…fects
  • Loading branch information
@oli-obk
oli-obk committed Jan 9, 2023
commit 200b34dffe93f77ddbc064c821f745a55e6c2837
3 changes: 1 addition & 2 deletions library/core/src/alloc/layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,8 @@ impl Layout {
/// # assert_eq!(repr_c(&[u64, u32, u16, u32]), Ok((s, vec![0, 8, 12, 16])));
/// ```
#[stable(feature = "alloc_layout_manipulation", since = "1.44.0")]
#[rustc_const_unstable(feature = "const_alloc_layout", issue = "67521")]
#[inline]
pub const fn extend(&self, next: Self) -> Result<(Self, usize), LayoutError> {
pub fn extend(&self, next: Self) -> Result<(Self, usize), LayoutError> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this change?

let new_align = cmp::max(self.align, next.align);
let pad = self.padding_needed_for(next.align());

Expand Down
4 changes: 2 additions & 2 deletions library/core/src/ptr/alignment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ impl From<Alignment> for usize {

#[rustc_const_unstable(feature = "const_alloc_layout", issue = "67521")]
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
impl const cmp::Ord for Alignment {
impl cmp::Ord for Alignment {
#[inline]
fn cmp(&self, other: &Self) -> cmp::Ordering {
self.as_nonzero().get().cmp(&other.as_nonzero().get())
Expand All @@ -179,7 +179,7 @@ impl const cmp::Ord for Alignment {

#[rustc_const_unstable(feature = "const_alloc_layout", issue = "67521")]
#[unstable(feature = "ptr_alignment_type", issue = "102070")]
impl const cmp::PartialOrd for Alignment {
impl cmp::PartialOrd for Alignment {
#[inline]
fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
Some(self.cmp(other))
Expand Down