rebase from master

This commit is contained in:
Quentin de Quelen
2020-02-02 22:59:19 +01:00
committed by qdequele
parent 2143226f04
commit dc6907e748
29 changed files with 92 additions and 105 deletions

View File

@ -24,7 +24,7 @@ impl FieldsMap {
if let Some(id) = self.name_map.get(name) {
return Ok(*id)
}
let id = self.next_id.into();
let id = self.next_id;
self.next_id = self.next_id.next()?;
self.name_map.insert(name.to_string(), id);
self.id_map.insert(id, name.to_string());
@ -39,7 +39,7 @@ impl FieldsMap {
}
pub fn id(&self, name: &str) -> Option<FieldId> {
self.name_map.get(name).map(|s| *s)
self.name_map.get(name).copied()
}
pub fn name<I: Into<FieldId>>(&self, id: I) -> Option<&str> {