bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fixed long strings

Browse source
This commit is contained in:
Bernardo Meurer 2018-08-22 16:54:05 -03:00
parent 22beeb4cab
commit 37db3db53d
No known key found for this signature in database
GPG key ID: E421C74191EA186C
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/librustc/mir/interpret/error.rs
View file

@ -325,7 +325,8 @@ impl<'tcx, O> EvalErrorKind<'tcx, O> {
ReadForeignStatic => ReadForeignStatic =>
"tried to read from foreign (extern) static", "tried to read from foreign (extern) static",
InvalidPointerMath => 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 => ReadUndefBytes =>
"attempted to read undefined bytes", "attempted to read undefined bytes",
DeadLocal => DeadLocal =>
@ -379,11 +380,13 @@ impl<'tcx, O> EvalErrorKind<'tcx, O> {
Layout(_) => Layout(_) =>
"rustc layout computation failed", "rustc layout computation failed",
UnterminatedCString(_) => 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 => HeapAllocZeroBytes =>
"tried to re-, de- or allocate zero bytes on the heap", "tried to re-, de- or allocate zero bytes on the heap",
HeapAllocNonPowerOfTwoAlignment(_) => 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 => Unreachable =>
"entered unreachable code", "entered unreachable code",
Panic { .. } => Panic { .. } =>
@ -445,8 +448,8 @@ impl<'tcx, O: fmt::Debug> fmt::Debug for EvalErrorKind<'tcx, O> {
kind, ptr, len, lock) kind, ptr, len, lock)
} }
InvalidMemoryLockRelease { ptr, len, frame, ref lock } => { InvalidMemoryLockRelease { ptr, len, frame, ref lock } => {
write!(f, "frame {} tried to release memory write lock at {:?}, size {}, but cannot release lock {:?}", write!(f, "frame {} tried to release memory write lock at {:?}, size {}, but \
frame, ptr, len, lock) cannot release lock {:?}", frame, ptr, len, lock)
} }
DeallocatedLockedMemory { ptr, ref lock } => { DeallocatedLockedMemory { ptr, ref lock } => {
write!(f, "tried to deallocate memory at {:?} in conflict with 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), NoMirFor(ref func) => write!(f, "no mir for `{}`", func),
FunctionPointerTyMismatch(sig, got) => 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 } => BoundsCheck { ref len, ref index } =>
write!(f, "index out of bounds: the len is {:?} but the index is {:?}", len, index), write!(f, "index out of bounds: the len is {:?} but the index is {:?}", len, index),
ReallocatedWrongMemoryKind(ref old, ref new) => ReallocatedWrongMemoryKind(ref old, ref new) =>
@ -480,7 +484,8 @@ impl<'tcx, O: fmt::Debug> fmt::Debug for EvalErrorKind<'tcx, O> {
MachineError(ref inner) => MachineError(ref inner) =>
write!(f, "{}", inner), write!(f, "{}", inner),
IncorrectAllocationInformation(size, size2, align, align2) => 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 } => Panic { ref msg, line, col, ref file } =>
write!(f, "the evaluated program panicked at '{}', {}:{}:{}", msg, file, line, col), write!(f, "the evaluated program panicked at '{}', {}:{}:{}", msg, file, line, col),
_ => write!(f, "{}", self.description()), _ => write!(f, "{}", self.description()),