summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2015-05-07 00:13:57 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2015-05-07 00:14:02 +0200
commitece7229f93f66dde7a15f0a52125ab14ca71babd (patch)
treef574670fa2c4b5cbd47cef56965134e1ee03c889
parent308fb4f7923989e90087fb70a6d1f914af3ede67 (diff)
downloadvtcol-ece7229f93f66dde7a15f0a52125ab14ca71babd.tar.gz
vtcol.rs: remove extraneous lifetimes
Did the lifetime analysis improve? These were required last time I checked …
-rw-r--r--src/vtcol.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/vtcol.rs b/src/vtcol.rs
index d3001a7..3503462 100644
--- a/src/vtcol.rs
+++ b/src/vtcol.rs
@@ -86,14 +86,14 @@ impl Color {
} /* [impl Color] */
#[derive(Debug)]
-enum Scheme<'a> {
+enum Scheme {
Default,
SolarizedDark,
SolarizedLight,
Custom (String)
}
-impl<'a> std::fmt::Display for Scheme<'a> {
+impl<'a> std::fmt::Display for Scheme {
fn
fmt (&self, f : &mut std::fmt::Formatter) -> std::fmt::Result
@@ -115,16 +115,16 @@ extern { fn exit (code : libc::c_int) -> !; }
/* struct Job -- Runtime parameters.
*/
#[derive(Debug)]
-struct Job<'a> {
- this : String, /* argv[0] */
- scheme : Scheme<'a>, /* The color scheme to switch to. */
+struct Job {
+ this : String, /* argv[0] */
+ scheme : Scheme, /* The color scheme to switch to. */
}
-impl<'a> Job<'a> {
+impl<'a> Job {
pub fn
new ()
- -> Job<'a>
+ -> Job
{
let argv = std::env::args();
let this = argv[0].clone();
@@ -194,7 +194,7 @@ impl<'a> Job<'a> {
fn
pick_scheme <'b> (name : &String)
- -> Scheme<'b>
+ -> Scheme
{
match name.as_slice() {
"solarized" | "solarized_dark" | "sd"
@@ -300,7 +300,6 @@ static DUMMY_COLORS : RawPalette<'static> = [
"000000", "ffffff", "000000", "ffffff",
];
-#[derive(Debug)]
pub struct Palette {
colors : [u8; PALETTE_BYTES]
}