diff --git a/src/front/glsl/error.rs b/src/front/glsl/error.rs index 420f6a2e9f..0044391425 100644 --- a/src/front/glsl/error.rs +++ b/src/front/glsl/error.rs @@ -26,7 +26,7 @@ pub enum ExpectedToken { IntLiteral, FloatLiteral, BoolLiteral, - EOF, + Eof, } impl From for ExpectedToken { fn from(token: TokenValue) -> Self { @@ -42,7 +42,7 @@ impl std::fmt::Display for ExpectedToken { ExpectedToken::IntLiteral => write!(f, "integer literal"), ExpectedToken::FloatLiteral => write!(f, "float literal"), ExpectedToken::BoolLiteral => write!(f, "bool literal"), - ExpectedToken::EOF => write!(f, "end of file"), + ExpectedToken::Eof => write!(f, "end of file"), } } } diff --git a/src/front/glsl/parser.rs b/src/front/glsl/parser.rs index 2b8239152b..9cc881cb13 100644 --- a/src/front/glsl/parser.rs +++ b/src/front/glsl/parser.rs @@ -427,8 +427,8 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> { TokenValue::Semicolon if self.program.version == 460 => Ok(()), _ => { let expected = match self.program.version { - 460 => vec![TokenValue::Semicolon.into(), ExpectedToken::EOF], - _ => vec![ExpectedToken::EOF], + 460 => vec![TokenValue::Semicolon.into(), ExpectedToken::Eof], + _ => vec![ExpectedToken::Eof], }; Err(ErrorKind::InvalidToken(token, expected)) } diff --git a/src/front/glsl/parser_tests.rs b/src/front/glsl/parser_tests.rs index 81107171e3..40281ed368 100644 --- a/src/front/glsl/parser_tests.rs +++ b/src/front/glsl/parser_tests.rs @@ -56,7 +56,7 @@ fn version() { value: TokenValue::Unknown(PreprocessorError::UnexpectedHash), meta: SourceMetadata { start: 24, end: 25 } }, - vec![ExpectedToken::EOF] + vec![ExpectedToken::Eof] ) );