matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add missing lifetimes

Browse source
This commit is contained in:
Matthias Beyer 2015-12-21 19:13:05 +01:00
parent 63bbede00f
commit 62150c5a61
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/module/bm/mod.rs
View file

@ -24,7 +24,7 @@ impl<'a> BM<'a> {
} }
impl<'a> Module for BM<'a> { impl<'a> Module<'a> for BM<'a> {
fn exec(&self, matches: &ArgMatches) -> bool { fn exec(&self, matches: &ArgMatches) -> bool {
unimplemented!() unimplemented!()

14
src/storage/file/mod.rs
View file

@ -22,7 +22,7 @@ use self::header::data::*;
* internally until it is written to disk. * internally until it is written to disk.
*/ */
pub struct File<'a> { pub struct File<'a> {
owning_module : &'a Module, owning_module : &'a Module<'a>,
header : FileHeaderData, header : FileHeaderData,
data : String, data : String,
id : FileID, id : FileID,
@ -30,7 +30,7 @@ pub struct File<'a> {
impl<'a> File<'a> { impl<'a> File<'a> {
pub fn new(module: &'a Module) -> File<'a> { pub fn new(module: &'a Module<'a>) -> File<'a> {
let f = File { let f = File {
owning_module: module, owning_module: module,
header: FileHeaderData::Null, header: FileHeaderData::Null,
@ -41,7 +41,7 @@ impl<'a> File<'a> {
f f
} }
pub fn from_parser_result(module: &Module, id: FileID, header: FileHeaderData, data: String) -> File { pub fn from_parser_result(module: &'a Module<'a>, id: FileID, header: FileHeaderData, data: String) -> File<'a> {
let f = File { let f = File {
owning_module: module, owning_module: module,
header: header, header: header,
@ -52,7 +52,7 @@ impl<'a> File<'a> {
f f
} }
pub fn new_with_header(module: &Module, h: FileHeaderData) -> File { pub fn new_with_header(module: &'a Module<'a>, h: FileHeaderData) -> File<'a> {
let f = File { let f = File {
owning_module: module, owning_module: module,
header: h, header: h,
@ -63,7 +63,7 @@ impl<'a> File<'a> {
f f
} }
pub fn new_with_data(module: &Module, d: String) -> File { pub fn new_with_data(module: &'a Module<'a>, d: String) -> File<'a> {
let f = File { let f = File {
owning_module: module, owning_module: module,
header: FileHeaderData::Null, header: FileHeaderData::Null,
@ -74,7 +74,7 @@ impl<'a> File<'a> {
f f
} }
pub fn new_with_content(module: &Module, h: FileHeaderData, d: String) -> File { pub fn new_with_content(module: &'a Module<'a>, h: FileHeaderData, d: String) -> File<'a> {
let f = File { let f = File {
owning_module: module, owning_module: module,
header: h, header: h,
@ -101,7 +101,7 @@ impl<'a> File<'a> {
self.id.clone() self.id.clone()
} }
pub fn owner(&self) -> &Module { pub fn owner(&self) -> &'a Module<'a> {
self.owning_module self.owning_module
} }

8
src/storage/path.rs
View file

@ -30,7 +30,7 @@ struct Path<'a> {
/* /*
* The module * The module
*/ */
module: &'a Module, module: &'a Module<'a>,
/* /*
* The ID * The ID
@ -43,7 +43,7 @@ struct Path<'a> {
impl<'a> Path<'a> { impl<'a> Path<'a> {
fn new(base: PathBuf, store: PathBuf, m: &Module, id: FileID) -> Path { fn new(base: PathBuf, store: PathBuf, m: &'a Module<'a>, id: FileID) -> Path<'a> {
Path { Path {
base: base, base: base,
store: store, store: store,
@ -54,7 +54,7 @@ impl<'a> Path<'a> {
} }
} }
fn new_with_idtype(base: PathBuf, store: PathBuf, m: &Module, id: FileIDType) -> Path { fn new_with_idtype(base: PathBuf, store: PathBuf, m: &'a Module<'a>, id: FileIDType) -> Path<'a> {
Path { Path {
base: base, base: base,
store: store, store: store,
@ -65,7 +65,7 @@ impl<'a> Path<'a> {
} }
} }
fn new_with_idhash(base: PathBuf, store: PathBuf, m: &Module, id: FileHash) -> Path { fn new_with_idhash(base: PathBuf, store: PathBuf, m: &'a Module<'a>, id: FileHash) -> Path<'a> {
Path { Path {
base: base, base: base,
store: store, store: store,