Aggregation of cosmetic changes made during work on REPL PRs: librustc_mir #64274
Conversation
This file contains 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
rust-highfive
added
the
S-waiting-on-review
Centril
reviewed
Sep 8, 2019
| /// I'm not sure this is the right approach - @eddyb could you try and | ||
| /// figure this out? | ||
| // | ||
| // FIXME: I'm not sure this is the right approach -- @eddyb, could you try and |
There was a problem hiding this comment.
Keep as doc-comment for same reason as the case in the other PR.
| ProjectionElem::Index(..) | ||
| | ProjectionElem::ConstantIndex { .. } | ||
| | ProjectionElem::Subslice { .. } => { | ||
| ProjectionElem::Index(..) | |
There was a problem hiding this comment.
This is formatting away from the official rustfmt style; can you please remove the styling changes to match arms in the PR (and if there are other ones in the other PR) altogether? It's not clear to me that they are a win; they mostly just introduce more commits in blame and rustfmt will reformat them anyways later.
| @@ -375,17 +376,17 @@ fn do_mir_borrowck<'a, 'tcx>( | |||
| mbcx.errors_buffer.sort_by_key(|diag| diag.span.primary_span()); | |||
|
|
|||
| if !mbcx.disable_error_downgrading && tcx.migrate_borrowck() { | |||
There was a problem hiding this comment.
Aaw... this is going to conflict with my PR in #64221 unless git is clever... oh well; I guess I can rebase.
| @@ -833,13 +832,13 @@ enum AccessDepth { | |||
| /// this action." | |||
| Deep, | |||
|
|
|||
| /// Access is Deep only when there is a Drop implementation that | |||
| /// Access is deep only when there is a `Drop` implementation that | |||
There was a problem hiding this comment.
Suggested change
| /// Access is deep only when there is a `Drop` implementation that | |
| /// Access is `Deep` only when there is a `Drop` implementation that |
| @@ -1580,9 +1578,9 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> { | |||
| ) { | |||
| debug!("check_if_reassignment_to_immutable_state({:?})", local); | |||
|
|
|||
| // Check if any of the initializiations of `local` have happened yet: | |||
| // Check if any of the initializiations of `local` have happened yet. | |||
There was a problem hiding this comment.
Suggested change
| // Check if any of the initializiations of `local` have happened yet. | |
| // Check if any of the initializiations of `local` have happened yet... |
| let alloc_id = self.tcx.alloc_map.lock().create_static_alloc(cid.instance.def_id()); | ||
| let ptr = self.tag_static_base_pointer(Pointer::from(alloc_id)); | ||
| MPlaceTy::from_aligned_ptr(ptr, layout) | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| /// Computes a place. You should only use this if you intend to write into this | ||
| /// place; for reading, a more efficient alternative is `eval_place_for_read`. |
There was a problem hiding this comment.
The warning here is presumably there for a reason, revert.
| StorageDead(local) => { | ||
| let old_val = self.storage_dead(local); | ||
| self.deallocate_local(old_val)?; | ||
| } | ||
|
|
||
| // No dynamic semantics attached to `FakeRead`; MIR | ||
| // No dynamic semantics attached to FakeRead; MIR |
| @@ -121,7 +121,7 @@ impl<'tcx> MirPass<'tcx> for AddRetag { | |||
| } | |||
| TerminatorKind::Drop { .. } | | |||
| TerminatorKind::DropAndReplace { .. } => { | |||
| // `Drop` is also a call, but it doesn't return anything so we are good. | |||
| // Drop is also a call, but it doesn't return anything so we are good. | |||
| @@ -269,7 +269,7 @@ impl MutVisitor<'tcx> for TransformVisitor<'tcx> { | |||
| fn visit_basic_block_data(&mut self, | |||
| block: BasicBlock, | |||
| data: &mut BasicBlockData<'tcx>) { | |||
| // Remove StorageLive and StorageDead statements for remapped locals | |||
| // Remove StorageLive and StorageDead statements for remapped locals. | |||
There was a problem hiding this comment.
Suggested change
| // Remove StorageLive and StorageDead statements for remapped locals. | |
| // Remove `StorageLive` and `StorageDead` statements for remapped locals. |
| @@ -1702,9 +1702,9 @@ impl<'tcx> MirPass<'tcx> for QualifyAndPromoteConstants<'tcx> { | |||
| Checker::new(tcx, def_id, body, mode).check_const().1 | |||
| }; | |||
|
|
|||
| // In `const` and `static` everything without `StorageDead` | |||
There was a problem hiding this comment.
Revert the removal of backticks here in this file.
|
Thanks for the PR. Unfortunately, as per our rules set up in #58619, I am closing this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Factored out from hacking on rustc for work on the REPL.
r? @Centril