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.

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

Fix flux ci #3

Merged
merged 10 commits into from
Oct 4, 2024
Merged

Fix flux ci #3

merged 10 commits into from
Oct 4, 2024

Conversation

Samir-Rashid
Copy link
Collaborator

@Samir-Rashid Samir-Rashid commented Oct 1, 2024

im testing ci

@Samir-Rashid
Copy link
Collaborator Author

Samir-Rashid commented Oct 1, 2024

@enjhnsn2 Remaining errors before this PR is good to go

Rust problems:

error: mutable borrow from immutable input(s)
  --> kernel/src/platform/chip.rs:41:22
   |
41 |     fn mpu(&self) -> &mut Self::MPU;
   |                      ^^^^^^^^^^^^^^
   |

and flux_support is not allowed to use std.

Flux problems:

error[E0999]: cannot access fields of opaque struct `flux_ptr::FluxPtr`
  --> flux_support/src/flux_ptr.rs:19:9
   |
19 | /         FluxPtr {
20 | |             inner: value as *mut u8,
21 | |         }
   | |_________^

error[E0999]: cannot access fields of opaque struct `flux_ptr::FluxPtr`
  --> flux_support/src/flux_ptr.rs:34:9
   |
34 |         ptr.inner as u8
   |         ^^^^^^^^^

error[E0999]: cannot access fields of opaque struct `flux_ptr::FluxPtr`
  --> flux_support/src/flux_ptr.rs:49:10
   |
49 |         (self.inner as usize) % rhs
   |          ^^^^^^^^^^

error[E0999]: cannot access fields of opaque struct `flux_ptr::FluxPtr`
  --> flux_support/src/flux_ptr.rs:57:21
   |
57 |             inner: (self.inner as usize + rhs) as *mut u8,
   |                     ^^^^^^^^^^

@enjhnsn2
Copy link
Collaborator

enjhnsn2 commented Oct 1, 2024

For the imports that use std std::ops::Rem and std::slice::Iter, those both have core counterparts, can you just replace them with core::ops::Rem and core::slice::Iter?

@enjhnsn2
Copy link
Collaborator

enjhnsn2 commented Oct 1, 2024

As for the flux issues: if those functions aren't passing right because you need to access inner, just mark them flux_rs::trusted for now

@Samir-Rashid
Copy link
Collaborator Author

I have addressed your comments. I believe this PR is done and more work should be moved to further development. Only needs to wait on me to rebase the ring_buffer changes.

Remaining work:

  1. Resolve mpu ownership error
  2. A bunch of legitmate Flux errors have cropped up
  3. A new Flux internal compiler error. I will diagnose and submit an issue.

@enjhnsn2
Copy link
Collaborator

enjhnsn2 commented Oct 2, 2024

What legitimate Flux errors have popped up? The only flux changes (I think) should be providing implementations for trusted functions, which shouldn't raise errors.

@enjhnsn2
Copy link
Collaborator

enjhnsn2 commented Oct 2, 2024

Once we resolve the above issues I'll merge

@Samir-Rashid
Copy link
Collaborator Author

There are only overflow errors.

@enjhnsn2 enjhnsn2 merged commit 692fcb1 into master Oct 4, 2024
0 of 13 checks passed
@enjhnsn2 enjhnsn2 deleted the fix-flux-ci branch October 4, 2024 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants