diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-17 22:57:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-17 22:57:35 +0200 |
| commit | 4ec9703467c6934bf0bc8be922f242226c32d0aa (patch) | |
| tree | ce84a235d00e830c186fc3892c8ab0fd2351d329 | |
| parent | b60f245b9542142ed01318a7ab5b46fc2ffb283e (diff) | |
| parent | a7c34f1ce99887675f3d79740e2c9f739a89fe45 (diff) | |
| download | rust-4ec9703467c6934bf0bc8be922f242226c32d0aa.tar.gz rust-4ec9703467c6934bf0bc8be922f242226c32d0aa.zip | |
Rollup merge of #63669 - Dante-Broggi:patch-1, r=jonas-schievink
fix typos in mir/interpret
| -rw-r--r-- | src/librustc/mir/interpret/allocation.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/interpret/memory.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc/mir/interpret/allocation.rs b/src/librustc/mir/interpret/allocation.rs index ce04cca96e0..84b4cd91456 100644 --- a/src/librustc/mir/interpret/allocation.rs +++ b/src/librustc/mir/interpret/allocation.rs @@ -306,7 +306,7 @@ impl<'tcx, Tag: Copy, Extra: AllocationExtra<Tag>> Allocation<Tag, Extra> { /// /// zsts can't be read out of two reasons: /// * byteorder cannot work with zero element buffers - /// * in oder to obtain a `Pointer` we need to check for ZSTness anyway due to integer pointers + /// * in order to obtain a `Pointer` we need to check for ZSTness anyway due to integer pointers /// being valid for ZSTs /// /// It is the caller's responsibility to check bounds and alignment beforehand. diff --git a/src/librustc_mir/interpret/memory.rs b/src/librustc_mir/interpret/memory.rs index 6771d7661e3..87d36dabb04 100644 --- a/src/librustc_mir/interpret/memory.rs +++ b/src/librustc_mir/interpret/memory.rs @@ -297,7 +297,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> { /// and `align`. On success, returns `None` for zero-sized accesses (where /// nothing else is left to do) and a `Pointer` to use for the actual access otherwise. /// Crucially, if the input is a `Pointer`, we will test it for liveness - /// *even of* the size is 0. + /// *even if* the size is 0. /// /// Everyone accessing memory based on a `Scalar` should use this method to get the /// `Pointer` they need. And even if you already have a `Pointer`, call this method |
