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

enable usage with non-nightly rust #127

Merged
merged 1 commit into from
Feb 21, 2020
Merged

enable usage with non-nightly rust #127

merged 1 commit into from
Feb 21, 2020

Conversation

haraldh
Copy link
Contributor

@haraldh haraldh commented Feb 18, 2020

default is "nightly"

to compile with stable rust:
x86_64 = { version = "0.9", default-features = false, features = [ "stable" ] }

Copy link
Member

@phil-opp phil-opp left a comment

Choose a reason for hiding this comment

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

Thanks a lot for the PR! The changes mostly look good to me, apart from the comments I left.

src/structures/paging/page_table.rs Outdated Show resolved Hide resolved
src/structures/paging/page_table.rs Outdated Show resolved Hide resolved
@phil-opp
Copy link
Member

Also, we should adjust the CI to also build without the nightly feature and with the stable feature.

@phil-opp
Copy link
Member

Another thing: What happens when the user enables both the nightly and stable features? I expect there will be some duplicated function errors. Perhaps it's possible to add a custom error message for this case?

@haraldh
Copy link
Contributor Author

haraldh commented Feb 18, 2020

Another thing: What happens when the user enables both the nightly and stable features? I expect there will be some duplicated function errors. Perhaps it's possible to add a custom error message for this case?

if "nightly" and "stable" are enabled, then it results in "nightly"

@haraldh
Copy link
Contributor Author

haraldh commented Feb 18, 2020

Another thing: What happens when the user enables both the nightly and stable features? I expect there will be some duplicated function errors. Perhaps it's possible to add a custom error message for this case?

if "nightly" and "stable" are enabled, then it results in "nightly"

which is nice, as one can start with "stable" and add "nightly" as part of other feature sets

@phil-opp
Copy link
Member

if "nightly" and "stable" are enabled, then it results in "nightly"

which is nice, as one can start with "stable" and add "nightly" as part of other feature sets

Makes sense!

@haraldh
Copy link
Contributor Author

haraldh commented Feb 18, 2020

Also, we should adjust the CI to also build without the nightly feature and with the stable feature.

done

@haraldh
Copy link
Contributor Author

haraldh commented Feb 18, 2020

Also, we should adjust the CI to also build without the nightly feature and with the stable feature.

done

left out windows.. don't know how to install the needed toolchain

Copy link
Member

@phil-opp phil-opp left a comment

Choose a reason for hiding this comment

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

Thanks for the update! Looks good to me now.

It would be nice if you could add a short section about the nightly and stable features to the README. We should also mention that the stable feature is only tested on Linux and macOS.

@haraldh
Copy link
Contributor Author

haraldh commented Feb 20, 2020

do not merge yet.. ironing out some macos assembler issues

@haraldh
Copy link
Contributor Author

haraldh commented Feb 20, 2020

ok.. lgtm.. Review again please

src/asm/asm.s Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
build.rs Outdated Show resolved Hide resolved
build.rs Outdated Show resolved Hide resolved
src/asm/mod.rs Show resolved Hide resolved
default is "nightly"

to compile with stable rust:
x86_64 = { version = "0.9", default-features = false, features = [ "stable" ] }
@phil-opp phil-opp merged commit 22468a7 into rust-osdev:master Feb 21, 2020
phil-opp added a commit that referenced this pull request Feb 21, 2020
@phil-opp
Copy link
Member

Published as version 0.9.3.

@haraldh haraldh deleted the stable branch July 30, 2020 18:51
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.

None yet

2 participants