Change an enum from strict to flexible

Overview

Initial State

FIDL

strict enum Color : int32 {
    RED = 1;
    BLUE = 2;
    UNKNOWN_COLOR = 3;
};

Dart

fidllib.Color writer(String s) {
  if (s == 'red') {
    return fidllib.Color.red;
  } else if (s == 'blue') {
    return fidllib.Color.blue;
  } else {
    return fidllib.Color.unknownColor;
  }
}

String reader(fidllib.Color color) {
  switch (color) {
    case fidllib.Color.blue:
      return 'blue';
    case fidllib.Color.red:
      return 'red';
    case fidllib.Color.unknownColor:
      return 'unknown';
    default:
      return 'error';
  }
}

Go

func writer(s string) lib.Color {
	switch {
	case s == "blue":
		return lib.ColorBlue
	case s == "red":
		return lib.ColorRed
	default:
		return lib.ColorUnknownColor
	}
}

func reader(color lib.Color) (string, error) {
	switch color {
	case lib.ColorBlue:
		return "blue", nil
	case lib.ColorRed:
		return "red", nil
	case lib.ColorUnknownColor:
		return "unknown", nil
	default:
		return "", errors.New("invalid color enum")
	}
}

HLCPP

template <fidl_test::Color color>
class ComplementaryColors {};

fidl_test::Color writer(std::string s) {
  if (s == "red") {
    return fidl_test::Color::RED;
  } else if (s == "blue") {
    return fidl_test::Color::BLUE;
  } else {
    return fidl_test::Color::UNKNOWN_COLOR;
  }
}

std::string reader(fidl_test::Color color) {
  switch (color) {
    case fidl_test::Color::RED:
      return "red";
    case fidl_test::Color::BLUE:
      return "blue";
    case fidl_test::Color::UNKNOWN_COLOR:
      return "unknown";
    default:
      return "error";
  }
}

LLCPP

template <fidl_test::Color color>
class ComplementaryColors {};

fidl_test::Color writer(std::string s) {
  if (s == "red") {
    return fidl_test::Color::RED;
  } else if (s == "blue") {
    return fidl_test::Color::BLUE;
  } else {
    return fidl_test::Color::UNKNOWN_COLOR;
  }
}

std::string reader(fidl_test::Color color) {
  switch (color) {
    case fidl_test::Color::RED:
      return "red";
    case fidl_test::Color::BLUE:
      return "blue";
    case fidl_test::Color::UNKNOWN_COLOR:
      return "unknown";
    default:
      return "error";
  }
}

Rust

fn writer(s: &str) -> fidl_lib::Color {
    match s {
        "red" => fidl_lib::Color::Red,
        "blue" => fidl_lib::Color::Blue,
        _ => fidl_lib::Color::UnknownColor,
    }
}

fn reader(color: fidl_lib::Color) -> &'static str {
    match color {
        fidl_lib::Color::Red => "red",
        fidl_lib::Color::Blue => "blue",
        fidl_lib::Color::UnknownColor => "unknown",
    }
}

Update Source Code

HLCPP

• Remove any usages of the enum as a non-type template parameter. These usages are not supported for flexible enums.

- template <fidl_test::Color color>
- class ComplementaryColors {};
- 
  fidl_test::Color writer(std::string s) {
    if (s == "red") {
      return fidl_test::Color::RED;
    } else if (s == "blue") {
      return fidl_test::Color::BLUE;
    } else {
      return fidl_test::Color::UNKNOWN_COLOR;
    }
  }
  
  std::string reader(fidl_test::Color color) {
    switch (color) {

LLCPP

• Remove any usages of the enum as a non-type template parameter. These usages are not supported for flexible enums.

- template <fidl_test::Color color>
- class ComplementaryColors {};
- 
  fidl_test::Color writer(std::string s) {
    if (s == "red") {
      return fidl_test::Color::RED;
    } else if (s == "blue") {
      return fidl_test::Color::BLUE;
    } else {
      return fidl_test::Color::UNKNOWN_COLOR;
    }
  }
  
  std::string reader(fidl_test::Color color) {
    switch (color) {

Rust

• Allow unreachable patterns and add an underscore arm to any match statements on the enum.

  fn writer(s: &str) -> fidl_lib::Color {
      match s {
          "red" => fidl_lib::Color::Red,
          "blue" => fidl_lib::Color::Blue,
          _ => fidl_lib::Color::UnknownColor,
      }
  }
  
  fn reader(color: fidl_lib::Color) -> &'static str {
+     #[allow(unreachable_patterns)]
      match color {
          fidl_lib::Color::Red => "red",
          fidl_lib::Color::Blue => "blue",
-         fidl_lib::Color::UnknownColor => "unknown",
+         _ => "unknown",
      }
  }

Update FIDL Library

• Change from strict to flexible
• If the enum had a member representing an unknown enum, add the [Unknown] attribute to it

- strict enum Color : int32 {
+ flexible enum Color : int32 {
      RED = 1;
      BLUE = 2;
+     [Unknown]
      UNKNOWN_COLOR = 3;
  };

Update Source Code

Dart

• If using a custom unknown with the [Unknown] attribute, update readers and writers to use isUnknown and $unknown.

  fidllib.Color writer(String s) {
    if (s == 'red') {
      return fidllib.Color.red;
    } else if (s == 'blue') {
      return fidllib.Color.blue;
    } else {
-     return fidllib.Color.unknownColor;
+     return fidllib.Color.$unknown;
    }
  }
  
  String reader(fidllib.Color color) {
+   if (color.isUnknown()) {
+     return 'unknown';
+   }
    switch (color) {
      case fidllib.Color.blue:
        return 'blue';
      case fidllib.Color.red:
        return 'red';
-     case fidllib.Color.unknownColor:
-       return 'unknown';
      default:
        return 'error';
    }
  }

Go

• If using a custom unknown with the [Unknown] attribute, update readers and writers to use IsUnknown and the _Unknown constant.
• You can now use any flexible enum specific APIs

  func writer(s string) lib.Color {
  	switch {
  	case s == "blue":
  		return lib.ColorBlue
  	case s == "red":
  		return lib.ColorRed
  	default:
- 		return lib.ColorUnknownColor
+ 		return lib.Color_Unknown
  	}
  }
  
  func reader(color lib.Color) (string, error) {
+ 	if color.IsUnknown() {
+ 		return "unknown", nil
+ 	}
  	switch color {
  	case lib.ColorBlue:
  		return "blue", nil
  	case lib.ColorRed:
  		return "red", nil
- 	case lib.ColorUnknownColor:
- 		return "unknown", nil
  	default:
  		return "", errors.New("invalid color enum")
  	}
  }
  

HLCPP

• If using a custom unknown with the [Unknown] attribute, update readers and writers to use IsUnknown and Unknown.
• You can now use any flexible enum specific APIs

  fidl_test::Color writer(std::string s) {
    if (s == "red") {
      return fidl_test::Color::RED;
    } else if (s == "blue") {
      return fidl_test::Color::BLUE;
    } else {
-     return fidl_test::Color::UNKNOWN_COLOR;
+     return fidl_test::Color::Unknown();
    }
  }
  
  std::string reader(fidl_test::Color color) {
+   if (color.IsUnknown()) {
+     return "unknown";
+   }
    switch (color) {
      case fidl_test::Color::RED:
        return "red";
      case fidl_test::Color::BLUE:
        return "blue";
-     case fidl_test::Color::UNKNOWN_COLOR:
-       return "unknown";
      default:
        return "error";
    }
  }

LLCPP

• If using a custom unknown with the [Unknown] attribute, update readers and writers to use IsUnknown and Unknown.
• You can now use any flexible enum specific APIs

  fidl_test::Color writer(std::string s) {
    if (s == "red") {
      return fidl_test::Color::RED;
    } else if (s == "blue") {
      return fidl_test::Color::BLUE;
    } else {
-     return fidl_test::Color::UNKNOWN_COLOR;
+     return fidl_test::Color::Unknown();
    }
  }
  
  std::string reader(fidl_test::Color color) {
+   if (color.IsUnknown()) {
+     return "unknown";
+   }
    switch (color) {
      case fidl_test::Color::RED:
        return "red";
      case fidl_test::Color::BLUE:
        return "blue";
-     case fidl_test::Color::UNKNOWN_COLOR:
-       return "unknown";
      default:
        return "error";
    }
  }

Rust

• If using a custom unknown with the [Unknown] attribute, update readers and writers to use the ColorUnknown! macro (or is_unknown outside of match statements) and unknown.
• You can now use any flexible enum specific APIs

  fn writer(s: &str) -> fidl_lib::Color {
      match s {
          "red" => fidl_lib::Color::Red,
          "blue" => fidl_lib::Color::Blue,
-         _ => fidl_lib::Color::UnknownColor,
+         _ => fidl_lib::Color::unknown(),
      }
  }
  
  fn reader(color: fidl_lib::Color) -> &'static str {
-     #[allow(unreachable_patterns)]
      match color {
          fidl_lib::Color::Red => "red",
          fidl_lib::Color::Blue => "blue",
-         _ => "unknown",
+         fidl_lib::ColorUnknown!() => "unknown",
      }
  }

Update FIDL Library

• If transitioning away from a custom unknown member, you can now remove the placeholder member at this point.

  flexible enum Color : int32 {
      RED = 1;
      BLUE = 2;
-     [Unknown]
-     UNKNOWN_COLOR = 3;
  };