Skip to content

Move some chapters to the rustc-guide #285

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

Merged
merged 5 commits into from
Dec 9, 2019
Merged

Conversation

mark-i-m
Copy link
Member

@mark-i-m mark-i-m commented Dec 6, 2019

@XAMPPRocky
Copy link
Member

@mark-i-m Thank you for your PR, to accept this PR we'd also need to add redirects to the rustc-guide. You can add the appropriate redirects in the code shown below.

https://github.com/rust-lang/rust-forge/blob/master/blacksmith/src/lib.rs#L116

@mark-i-m
Copy link
Member Author

mark-i-m commented Dec 7, 2019

@XAMPPRocky Thanks! Done :)

@XAMPPRocky
Copy link
Member

@mark-i-m I left one last code review comment, and also in this PR could you remove .gitattributes? Since it was only there to hide the profile queries html from GitHub, and is no longer needed. Once both of those things are resolved this should be good to merge once the rustc guide PR is merged.

@mark-i-m
Copy link
Member Author

mark-i-m commented Dec 8, 2019

@XAMPPRocky I attempted to do the requested modifications, but I had a hard time figuring out how to run the blacksmith tool, so let me know if I did something incorrect.

@pietroalbini
Copy link
Member

@mark-i-m CI failed: https://travis-ci.com/rust-lang/rust-forge/builds/140145315#L470-L472

To run the tool calling mdbook build should be enough.

@XAMPPRocky
Copy link
Member

@mark-i-m As pietro said you should just need to run mdbook serve/mdbook build in the root directory and it should automatically build and run the blacksmith plugin.

@mark-i-m
Copy link
Member Author

mark-i-m commented Dec 9, 2019

Thanks! It looks like CI is passing now. I also added a note to the README.

I'm still unable to run locally, apparently because my installed mdbook is too recent, which is interesting...

@XAMPPRocky
Copy link
Member

@mark-i-m Thank you again for your PR!

@XAMPPRocky XAMPPRocky merged commit 52b021c into rust-lang:master Dec 9, 2019
jyn514 pushed a commit to jyn514/rust-forge that referenced this pull request Mar 15, 2020
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.

3 participants