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

@@ -25,7 +25,7 @@ enum Directive {
// 1. Keyword.
// 2. Rest of line / pattern.
//
const DIRECTIVE_RX: &'static str = r"\b(check|sameln|nextln|unordered|not|regex):\s+(.*)";
const DIRECTIVE_RX: &str = r"\b(check|sameln|nextln|unordered|not|regex):\s+(.*)";
impl Directive {
/// Create a new directive from a `DIRECTIVE_RX` match.
@@ -264,9 +264,9 @@ struct State<'a> {
impl<'a> State<'a> {
fn new(text: &'a str, env_vars: &'a VariableMap, recorder: &'a mut Recorder) -> State<'a> {
State {
text: text,
env_vars: env_vars,
recorder: recorder,
text,
env_vars,
recorder,
vars: HashMap::new(),
last_ordered: 0,
max_match: 0,

View File

@@ -60,7 +60,7 @@ pub struct Explainer<'a> {
impl<'a> Explainer<'a> {
pub fn new(text: &'a str) -> Explainer {
Explainer {
text: text,
text,
directive: 0,
matches: Vec::new(),
vardefs: Vec::new(),