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

Change how system.rs imports blocks to avoid merge conflicts #39

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

User344
Copy link
Member

@User344 User344 commented Dec 26, 2024

This PR fixes potential merge conflicts in other PR's by removing including blocks by name in system.rs and using block mod that I implemented.

Just doing

use crate::{
	*,
	prelude::{fmt, Arc, Box, Bytes, FromStr, Rc, String, ToString},
    types::{DelayType, Encoding},
}

would also suffice, but I don't like just including everything.

This seems like a good solution, considering that we will be refactoring the way we include modules soon either way.

@User344 User344 requested a review from artob as a code owner December 26, 2024 07:00
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ CI failed

Platform Name Status Details
All Formatting Details
Linux Build library Details
Linux Build binaries Details
Linux Build tests Details
Linux Build examples Details
Linux Run tests Details
Linux Run doctests Details

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ CI failed

Platform Name Status Details
All Formatting Details
Linux Build library Details
Linux Build binaries Details
Linux Build tests Details
Linux Build examples Details
Linux Run tests Details
Linux Run doctests Details

@User344 User344 added the enhancement New feature or request label Dec 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant