Uh oh!
There was an error while loading. Please reload this page.
Link panic and compile_error docs - #51153
Merged
Merged
Conversation
rust-highfive
commented
May 29, 2018
Contributor
r? @cramertj (rust_highfive has picked a reviewer for you, use r? to override) |
GuillaumeGomez
commented
May 29, 2018
Member
Nice, thanks! @bors: r+ rollup |
bors
commented
May 29, 2018
Collaborator
📌 Commit 1d7a0df has been approved by |
bors
commented
May 30, 2018
Collaborator
🔒 Merge conflict |
kennytm added a commit
to kennytm/rust
that referenced
this pull request
May 30, 2018
… r=GuillaumeGomez Link panic and compile_error docs This adds documentation links between `panic!()` and `compile_error!()` as per rust-lang#47275, which points out that they’re similar. It also adds a sentence to the `compile_error()` docs I thought could be added.
bors added a commit
that referenced
this pull request
May 30, 2018
Rollup of 12 pull requests Successful merges: - #51050 (std::fs::DirEntry.metadata(): use fstatat instead of lstat when possible) - #51123 (Update build instructions) - #51127 (Add doc link from discriminant struct to function.) - #51146 (typeck: Do not pass the field check on field error) - #51147 (Stabilize SliceIndex trait.) - #51151 (Move slice::exact_chunks directly above exact_chunks_mut for more con…) - #51152 (Replace `if` with `if and only if` in the definition dox of `Sync`) - #51153 (Link panic and compile_error docs) - #51158 (Mention spec and indented blocks in doctest docs) - #51186 (Remove two redundant .nll.stderr files) - #51203 (Two minor `obligation_forest` tweaks.) - #51213 (fs: copy: Use File::set_permissions instead of fs::set_permissions) Failed merges:
emilyalbini
commented
Jun 4, 2018
Member
@GuillaumeGomez this probably needs to be r+ed again. |
Member
@bors retry r- try (just to check if merge conflict will still happen) |
bors
commented
Jun 4, 2018
Collaborator
🔒 Merge conflict |
emilyalbini
commented
Jun 4, 2018
Member
Uh, nevermind. @ogham you need to rebase this PR on top of the latest master. |
ogham
commented
Jun 5, 2018
ContributorAuthor
I tried, but I got a conflict and I don’t know how to resolve it 😖 |
kennytm
commented
Jun 5, 2018
Member
@ogham Strange, what does |
emilyalbini
commented
Jun 18, 2018
Member
Fixesrust-lang#47275. These two macros are similar, but different, and could do with documentation links to each other.
It now details why using compile_error!() is different from just not having the final macro_rules!() branch.
emilyalbiniforce-pushed
the
panic-and-compile_error-docs
branch
from
June 25, 2018 08:34
1d7a0df to
f85ddfbCompareemilyalbini
commented
Jun 25, 2018
Member
Rebased the commits myself. @bors r=GuillaumeGomez rollup |
bors
commented
Jun 25, 2018
Collaborator
📌 Commit f85ddfb has been approved by |
GuillaumeGomez added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Jun 25, 2018
… r=GuillaumeGomez Link panic and compile_error docs This adds documentation links between `panic!()` and `compile_error!()` as per rust-lang#47275, which points out that they’re similar. It also adds a sentence to the `compile_error()` docs I thought could be added.
emilyalbini added a commit
to emilyalbini/rust
that referenced
this pull request
Jun 26, 2018
… r=GuillaumeGomez Link panic and compile_error docs This adds documentation links between `panic!()` and `compile_error!()` as per rust-lang#47275, which points out that they’re similar. It also adds a sentence to the `compile_error()` docs I thought could be added.
bors added a commit
that referenced
this pull request
Jun 26, 2018
Rollup of 11 pull requests Successful merges: - #51104 (add `dyn ` to display of dynamic (trait) types) - #51153 (Link panic and compile_error docs) - #51642 (Fix unknown windows build) - #51730 (New safe associated functions for PinMut) - #51731 (Fix ICEs when using continue as an array length inside closures (inside loop conditions)) - #51747 (Add error for using null characters in #[export_name]) - #51769 (Update broken rustc-guide links) - #51786 (Remove unnecessary stat64 pointer casts) - #51788 (Fix typo) - #51789 (Don't ICE when performing `lower_pattern_unadjusted` on a `TyError`) - #51791 (Minify css) Failed merges: r? @ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This adds documentation links between
panic!()andcompile_error!()as per #47275, which points out that they’re similar. It also adds a sentence to thecompile_error()docs I thought could be added.