-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Convert sub tutorials into Guides #10838 #11106
Convert sub tutorials into Guides #10838 #11106
Conversation
Awesome! I think the one other thing that needs to change is that |
@alanandrade seems like the makefile needs more work |
# Guides | ||
|
||
DOCS += doc/guides/macros.html | ||
doc/guides/macros.html: doc/guides/macros.md doc/version_info.html doc/rust.css \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
doc/guides/macros.md
→ guides/macros.md
and so on for each target?
@alan-andrade Let's try to get this merged for 0.9. Can you address the failures here? Note that #11052 adds a new tutorial so there will need to be a followup to make that a 'guide' as well. |
@alan-andrade Looks like you created |
@adridu59 not at all. I just rebased with master. |
@alan-andrade Turns out those two folders are generated files, it has been fixed in b3ae7b1 but Edit: must be a rebase fallout then? |
It might be. I wasn't aware. It'd be fixed by removing those folders ? |
ohhh I see. ok ok. I'll remove those. |
I think so. Check the diff and make sure there's no extra content inside and it should be all good. In case you're not aware, you can look through commit diff with |
@adridu59 I believe it's ready. |
@@ -1 +1 @@ | |||
Subproject commit 1e46da1000bc29679ab4cebf3c1034cb7d6f4487 | |||
Subproject commit f407f09c94e00d2d570e8e42114e3f6848b2deb2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have a feeling this shouldn't be reverting these submodules. ;)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@huonw I have no idea what's going on with this files. I'm going to keep the sha of the deleted line.
@huonw I appreciate your help. I believe this is the good one. |
This failure looks weird since I thought I could ssh to verify what's going on, but maybe someone knows what's going on ? |
The reason for that is that the builders run inside of a build directory instead of in the source root. I believe that the best way to do this is to update the dependencies to look like |
Ensure configure creates doc/guides directory Fix configure makefile and tests Remove old guides dir and configure option, convert testing to guide Remove ignored files Fix submodule issue prepend dir in makefile so that bor knows how to build the docs S to uppercase
@cmr typo fixed |
… r=cmr * Moved every the tutorial-*.md into its own directory `/doc/guides/` * Makefile is aware
[`unnecessary_literal_unwrap`]: Fix ICE on None.unwrap_or_default() Fixes rust-lang#11099 Fixes rust-lang#11064 I'm running into rust-lang#11099 (cc `@y21)` on my Rust codebase. Clippy ICEs on this code when evaluating the `unnecessary_literal_unwrap` lint: ```rust fn main() { let val1: u8 = None.unwrap_or_default(); } ``` This fixes that ICE and adds an message specifically for that case: ``` error: used `unwrap_or_default()` on `None` value --> $DIR/unnecessary_literal_unwrap.rs:26:5 | LL | None::<String>.unwrap_or_default(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove the `None` and `unwrap_or_default()`: `String::default()` ``` This PR also fixes the same ICE with `None.unwrap_or_else` (by giving the generic error message for the lint in that case). changelog: Fix ICE in `unnecessary_literal_unwrap` on `None.unwrap_or_default()`
[`unnecessary_literal_unwrap`]: Fix ICE on None.unwrap_or_default() Fixes rust-lang#11099 Fixes rust-lang#11064 I'm running into rust-lang#11099 (cc `@y21)` on my Rust codebase. Clippy ICEs on this code when evaluating the `unnecessary_literal_unwrap` lint: ```rust fn main() { let val1: u8 = None.unwrap_or_default(); } ``` This fixes that ICE and adds an message specifically for that case: ``` error: used `unwrap_or_default()` on `None` value --> $DIR/unnecessary_literal_unwrap.rs:26:5 | LL | None::<String>.unwrap_or_default(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove the `None` and `unwrap_or_default()`: `String::default()` ``` This PR also fixes the same ICE with `None.unwrap_or_else` (by giving the generic error message for the lint in that case). changelog: Fix ICE in `unnecessary_literal_unwrap` on `None.unwrap_or_default()`
/doc/guides/