Upgrade to Rust 1.17.

- Remove some uses of 'static in const and static globals that are no
  longer needed.
- Use the new struct initialization shorthand.
This commit is contained in:
Jakob Stoklund Olesen
2017-04-27 12:28:18 -07:00
parent eaf1ed09fc
commit ee5f035e31
31 changed files with 118 additions and 153 deletions

View File

@@ -55,7 +55,7 @@ pub struct LocatedToken<'a> {
/// Wrap up a `Token` with the given location.
fn token<'a>(token: Token<'a>, loc: Location) -> Result<LocatedToken<'a>, LocatedError> {
Ok(LocatedToken {
token: token,
token,
location: loc,
})
}
@@ -76,7 +76,7 @@ pub struct LocatedError {
/// Wrap up an `Error` with the given location.
fn error<'a>(error: Error, loc: Location) -> Result<LocatedToken<'a>, LocatedError> {
Err(LocatedError {
error: error,
error,
location: loc,
})
}