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

Children finding their parents #805

Merged
merged 19 commits into from
Feb 9, 2021
Merged

Children finding their parents #805

merged 19 commits into from
Feb 9, 2021

Conversation

Anton-Latukha
Copy link
Collaborator

@Anton-Latukha Anton-Latukha commented Jan 7, 2021 •
edited
Loading

Aligning instances according to the logical inheritance structure which is layed-out in the #778.

Since this PR is easier, waiting to be mergeable with #804. It changed some of the instances touched here.

@Anton-Latukha Anton-Latukha force-pushed the 2021-01-07-treating-orphans branch from 0503332 to 124a9f3 Compare January 21, 2021 09:31
@Anton-Latukha Anton-Latukha force-pushed the 2021-01-07-treating-orphans branch from 124a9f3 to e935904 Compare February 8, 2021 21:53
@Anton-Latukha
Copy link
Collaborator Author

Anton-Latukha commented Feb 8, 2021 •
edited
Loading

The #804 would free us from the StdIdT and so its instances.

@Anton-Latukha Anton-Latukha force-pushed the 2021-01-07-treating-orphans branch from 574644b to 3c44459 Compare February 8, 2021 23:26
@Anton-Latukha
make orphan instance warnings explicit
402aeb6
@Anton-Latukha
move instance Binary NAtom to the parent
b68cb66
@Anton-Latukha
move instances {From,To}JSON NAtom to the parent
71f50b2
@Anton-Latukha
move instances HasCitations1 NValue to the parent
3a99b16
@Anton-Latukha
move instance Eq1 NValueF to the parent
bca3868
@Anton-Latukha
move TH instance Eq1 NValue' to the parent as derivable
6c15ed7 
Eq1 instance was previously derived as an orphan through TemplateHaskell.
And that TH instance when moved into Nix.Value was breaking the NValue' data
constructor deriving.

So it is moved as derivable instance.
@Anton-Latukha
Nix/Exec: note to the instance MonadEval NValue
323c312
@Anton-Latukha
Expr/Types: rm orphan instances Hashable1 {NonEmpty,NExprF,Binding}
b5ef442
@Anton-Latukha
move Fix1{,T} instances to the type class parent
1131205 
Since type class is up the structure - move instances there.
@Anton-Latukha
move instances Monad{,Atomic}Ref Fix1T to the parent
902e6dd
@Anton-Latukha
move instance MonadFile Fix1T to the parent
d3532a3
@Anton-Latukha
move instance MonadStore Fix1T to the parent
0515c5f
@Anton-Latukha
Expr/Types: m upd
6383f1f
@Anton-Latukha
remaining map -> fmap
fa7aab2
@Anton-Latukha
Var: m refactor
0375504
@Anton-Latukha
Fresh{,.Basic}, Effects: m clean-up
fec7032
@Anton-Latukha
add back the "OPTIONS_GHC -Wno-orphans"
ecab803
@Anton-Latukha Anton-Latukha force-pushed the 2021-01-07-treating-orphans branch from 3c44459 to ecab803 Compare February 8, 2021 23:28
@Anton-Latukha Anton-Latukha marked this pull request as ready for review February 9, 2021 00:16
@Anton-Latukha Anton-Latukha force-pushed the 2021-01-07-treating-orphans branch from 6cac906 to 8c6fb78 Compare February 9, 2021 00:18
@Anton-Latukha
Copy link
Collaborator Author

Upstreamed the instance MonadAtomicRef (ST s): mainland/ref-tf#4

@Anton-Latukha Anton-Latukha merged commit fccb886 into master Feb 9, 2021
@Anton-Latukha Anton-Latukha deleted the 2021-01-07-treating-orphans branch February 9, 2021 00:45
@Anton-Latukha Anton-Latukha mentioned this pull request Feb 9, 2021
Draft
5 tasks
@Anton-Latukha Anton-Latukha changed the title Treating orphans Children finding their parents Feb 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Anton-Latukha