diff options
| author | Bernardo Meurer <meurerbernardo@gmail.com> | 2018-08-22 16:54:05 -0300 |
|---|---|---|
| committer | Bernardo Meurer <meurerbernardo@gmail.com> | 2018-08-23 08:52:31 -0700 |
| commit | 37db3db53dd1cd34b22efb52e2cd79b34aeb7e11 (patch) | |
| tree | 417dba63a7c1c6c8b22438c3bf7a25edf8ad4582 /src | |
| parent | 22beeb4cab4943b055625b71a5b7b8339ee38b3d (diff) | |
| download | rust-37db3db53dd1cd34b22efb52e2cd79b34aeb7e11.tar.gz rust-37db3db53dd1cd34b22efb52e2cd79b34aeb7e11.zip | |
Fixed long strings
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/mir/interpret/error.rs | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/librustc/mir/interpret/error.rs b/src/librustc/mir/interpret/error.rs index ac114e0c725..3590cbdf2c7 100644 --- a/src/librustc/mir/interpret/error.rs +++ b/src/librustc/mir/interpret/error.rs @@ -325,7 +325,8 @@ impl<'tcx, O> EvalErrorKind<'tcx, O> { ReadForeignStatic => "tried to read from foreign (extern) static", InvalidPointerMath => - "attempted to do invalid arithmetic on pointers that would leak base addresses, e.g. comparing pointers into different allocations", + "attempted to do invalid arithmetic on pointers that would leak base addresses, \ + e.g. comparing pointers into different allocations", ReadUndefBytes => "attempted to read undefined bytes", DeadLocal => @@ -379,11 +380,13 @@ impl<'tcx, O> EvalErrorKind<'tcx, O> { Layout(_) => "rustc layout computation failed", UnterminatedCString(_) => - "attempted to get length of a null terminated string, but no null found before end of allocation", + "attempted to get length of a null terminated string, but no null found before end + of allocation", HeapAllocZeroBytes => "tried to re-, de- or allocate zero bytes on the heap", HeapAllocNonPowerOfTwoAlignment(_) => - "tried to re-, de-, or allocate heap memory with alignment that is not a power of two", + "tried to re-, de-, or allocate heap memory with alignment that is not a power of + two", Unreachable => "entered unreachable code", Panic { .. } => @@ -445,8 +448,8 @@ impl<'tcx, O: fmt::Debug> fmt::Debug for EvalErrorKind<'tcx, O> { kind, ptr, len, lock) } InvalidMemoryLockRelease { ptr, len, frame, ref lock } => { - write!(f, "frame {} tried to release memory write lock at {:?}, size {}, but cannot release lock {:?}", - frame, ptr, len, lock) + write!(f, "frame {} tried to release memory write lock at {:?}, size {}, but \ + cannot release lock {:?}", frame, ptr, len, lock) } DeallocatedLockedMemory { ptr, ref lock } => { write!(f, "tried to deallocate memory at {:?} in conflict with lock {:?}", @@ -457,7 +460,8 @@ impl<'tcx, O: fmt::Debug> fmt::Debug for EvalErrorKind<'tcx, O> { } NoMirFor(ref func) => write!(f, "no mir for `{}`", func), FunctionPointerTyMismatch(sig, got) => - write!(f, "tried to call a function with sig {} through a function pointer of type {}", sig, got), + write!(f, "tried to call a function with sig {} through a \ + function pointer of type {}", sig, got), BoundsCheck { ref len, ref index } => write!(f, "index out of bounds: the len is {:?} but the index is {:?}", len, index), ReallocatedWrongMemoryKind(ref old, ref new) => @@ -480,7 +484,8 @@ impl<'tcx, O: fmt::Debug> fmt::Debug for EvalErrorKind<'tcx, O> { MachineError(ref inner) => write!(f, "{}", inner), IncorrectAllocationInformation(size, size2, align, align2) => - write!(f, "incorrect alloc info: expected size {} and align {}, got size {} and align {}", size.bytes(), align.abi(), size2.bytes(), align2.abi()), + write!(f, "incorrect alloc info: expected size {} and align {}, got size {} and \ + align {}", size.bytes(), align.abi(), size2.bytes(), align2.abi()), Panic { ref msg, line, col, ref file } => write!(f, "the evaluated program panicked at '{}', {}:{}:{}", msg, file, line, col), _ => write!(f, "{}", self.description()), |
