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

Broken chalk links #307

Merged
merged 1 commit into from Apr 26, 2019
Merged

Broken chalk links #307

merged 1 commit into from Apr 26, 2019

Conversation

igaray
Copy link
Member

@igaray igaray commented Apr 25, 2019

Fixed some links broken by rust-lang/chalk#215

@spastorino
Copy link
Member

I'd only put the Fix broken chalk links commit here. BTW there's a typo in that commit message Fied -> Fixed

@spastorino
Copy link
Member

Now looks good /cc @nikomatsakis

@igaray
Copy link
Member Author

igaray commented Apr 25, 2019

Travis still failed :(

@igaray
Copy link
Member Author

igaray commented Apr 25, 2019

mdbook test is the culprit this time, I didn't know about that.

@igaray
Copy link
Member Author

igaray commented Apr 25, 2019

CI toolchain hasn't yet updated to the rustc version which accepts the two-phase borrows in the two-phase borrow documentation examples.

@spastorino
Copy link
Member

Yes, your PR is unrelated and it's good to go.

@mark-i-m
Copy link
Member

Thanks @igaray! The CI failures are not from this PR they are from the last PR, which added the two-phase borrows chapter. If you don’t mind fixing them, that would be appreciated greatly. Basically all of the code blocks with error messages need to be annotated to tell mdbook test that they aren’t rust code: ```txt.

@igaray
Copy link
Member Author

igaray commented Apr 26, 2019

@mark-i-m Roger, will do. Although the offending code https://github.com/rust-lang/rustc-guide/pull/305/files#diff-5311fe548c2eb1bbb4b4ab3ca2151676R18 does in fact compile with the latest nightly (rustc 1.36.0-nightly (e305df184 2019-04-24)) and mdbook test passes. Given that the snippet is in fact correct code, should I still add the ignore marker to the snippet?

@mark-i-m
Copy link
Member

Oh. I guess I confused myself and misread your comment. I'm sorry.

In that case, I think we can just merge. I think the right solution is just for rustc-guide to use the nightly compiler in its CI. After all, it is describing the nightly state of the compiler...

@mark-i-m mark-i-m merged commit e905e3a into rust-lang:master Apr 26, 2019
@nikomatsakis
Copy link
Contributor

❤️ thanks all

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

4 participants