Commit e7e21296 authored by Jeremy Soller's avatar Jeremy Soller

Merge branch 'static-err' into 'master'

Give Error::text() a static lifetime

See merge request redox-os/syscall!29
parents 495b0974 d230cc98
......@@ -28,12 +28,8 @@ impl Error {
}
}
pub fn text(&self) -> &str {
if let Some(description) = STR_ERROR.get(self.errno as usize) {
description
} else {
"Unknown Error"
}
pub fn text(&self) -> &'static str {
STR_ERROR.get(self.errno as usize).map(|&x| x).unwrap_or("Unknown Error")
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment