Uh oh!
There was an error while loading. Please reload this page.
Rename all mentions of nil to unit - #54095
Conversation
rust-highfive
commented
Sep 10, 2018
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @davidtwco (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
rust-highfive
commented
Sep 10, 2018
|
rust-highfive
commented
Sep 10, 2018
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
kenta7777
commented
Sep 10, 2018
scottmcm
commented
Sep 10, 2018
This seems to have a bunch of surprising submodule changes? |
davidtwco
left a comment
There was a problem hiding this comment.
Thanks for the PR @kenta7777!
The change from nil to unit seems fine to me (cc @nikomatsakis) but like @scottmcm said, I'm not sure why there are submodule changes? - these seem unrelated to #53719.
bors
commented
Sep 10, 2018
☔ The latest upstream changes (presumably #54011) made this pull request unmergeable. Please resolve the merge conflicts. |
kenta7777
commented
Sep 11, 2018
@davidtwco@scottmcm Thank you for your review and comment. I had changed the submodule code by mistake. I will fix and send pull request again. |
kenta7777
commented
Sep 11, 2018
I reverted my commits about changing submodule codes and committed mk_nil to mk_unit change only. |
davidtwco
commented
Sep 11, 2018
@kenta7777 This is looking really great. I've spotted a handful of other places in the compiler (such as those below) where there are still references to Lines 1461 to 1466 in 7f81604 rust/src/libserialize/opaque.rs Lines 57 to 60 in 7f81604 If you could tackle these (and any remaining references to |
kenta7777
commented
Sep 11, 2018
@davidtwco Thank you for your prompt response. I'll tackle with at least is_nil and emit_nil. |
nikomatsakis
commented
Sep 11, 2018
I think this seems fine — I agree that "nil" isn't really standard Rust terminology these days. Nice job @davidtwco catching the missing cases. |
davidtwco
commented
Sep 11, 2018
Great work @kenta7777! @bors r+ |
bors
commented
Sep 11, 2018
📌 Commit 8134ee2 has been approved by |
bors
commented
Sep 11, 2018
☔ The latest upstream changes (presumably #53873) made this pull request unmergeable. Please resolve the merge conflicts. |
davidtwco
commented
Sep 12, 2018
@kenta7777 Looks like you need to rebase this. Consider squashing to fewer commits when doing so. Once you do I'll take another look and re-approve. |
kenta7777
commented
Sep 12, 2018
@davidtwco I rebased this and resolved the merge conflicts. |
davidtwco
commented
Sep 12, 2018
@bors r+ |
bors
commented
Sep 12, 2018
📌 Commit 26dbf56 has been approved by |
Rename all mentions of `nil` to `unit` Fixesrust-lang#53719. Renamed keywords nil to unit.
Rollup of 8 pull requests Successful merges: - #53218 (Add a implementation of `From` for converting `&'a Option<T>` into `Option<&'a T>`) - #54024 (Fix compiling some rustc crates to wasm) - #54095 (Rename all mentions of `nil` to `unit`) - #54173 (Suggest valid crate type if invalid crate type is found) - #54194 (Remove println!() statement from HashMap unit test) - #54203 (Fix the stable release of os_str_str_ref_eq) - #54207 (re-mark the never docs as unstable) - #54210 (Update Cargo) Failed merges: r? @ghost
kenta7777
commented
Sep 14, 2018
Thanks! |
Fixes#53719.
Renamed keywords nil to unit.