Commit 147343c

committed

FileHandle::into_type does no longer return a result

1 parent 3018cfb commit 147343cCopy full SHA for 147343c

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	- Added `BootServices::get_handle_for_protocol`.
`14`	`14`	- the `File` trait now knows the methods `is_regular_file()` and `is_directory`.
`15`	`15`	Developers profit from this on the struct `FileHandle`, for example.
	`16`	+- Breaking`: FileHandle::into_type()` does no longer return a Result but a direct type
`16`	`17`
`17`	`18`	`### Changed`
`18`	`19`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -252,20 +252,20 @@ impl FileHandle {`
`252`	`252`
`253`	`253`	/// Converts `File` into a more specific subtype based on if it is a
`254`	`254`	/// directory or not. It does this via a call to `get_position`.
`255`		`- pub fn into_type(self) -> Result<FileType> {`
	`255`	`+ pub fn into_type(self) -> FileType {`
`256`	`256`	`use FileType::*;`
`257`	`257`
`258`	`258`	`if self.is_regular_file() {`
`259`		`- unsafe { Ok(Regular(RegularFile::new(self))) }`
	`259`	`+ unsafe { Regular(RegularFile::new(self)) }`
`260`	`260`	`} else {`
`261`		`- unsafe { Ok(Dir(Directory::new(self))) }`
	`261`	`+ unsafe { Dir(Directory::new(self)) }`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`/// If the handle represents a directory, convert it into a`
`266`	`266`	/// [`Directory`]. Otherwise returns `None`.
`267`	`267`	`pub fn into_directory(self) -> Option<Directory> {`
`268`		`- if let Ok(FileType::Dir(dir)) = self.into_type() {`
	`268`	`+ if let FileType::Dir(dir) = self.into_type() {`
`269`	`269`	`Some(dir)`
`270`	`270`	`} else {`
`271`	`271`	`None`
`@@ -275,7 +275,7 @@ impl FileHandle {`
`275`	`275`	`/// If the handle represents a regular file, convert it into a`
`276`	`276`	/// [`RegularFile`]. Otherwise returns `None`.
`277`	`277`	`pub fn into_regular_file(self) -> Option<RegularFile> {`
`278`		`- if let Ok(FileType::Regular(regular)) = self.into_type() {`
	`278`	`+ if let FileType::Regular(regular) = self.into_type() {`
`279`	`279`	`Some(regular)`
`280`	`280`	`} else {`
`281`	`281`	`None`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ pub fn test_simple_file_system_protocol(image: Handle, bt: &BootServices) {`
`79`	`79`	`)`
`80`	`80`	`.unwrap();`
`81`	`81`	`assert!(created_file.is_regular_file());`
`82`		`- let created_file = match created_file.into_type().unwrap() {`
	`82`	`+ let created_file = match created_file.into_type() {`
`83`	`83`	`FileType::Regular(file) => file,`
`84`	`84`	`_ => panic!("unsupported value"),`
`85`	`85`	`};`

Comments

(0)