fix ci build

Author: lifr0m

tl-parser/src/lib.rs

@@ -111,7 +111,7 @@ fn parse_definitions<'a>(
             Some("type") => types.push(parse_type_definition(id, line, def, &types)?),
             Some("error") => errors.push(parse_error_definition(id, line, def, &types, &errors)?),
             Some("func") => functions.push(parse_function_definition(id, line, def, &types, &functions)?),
-            Some(r#type) => return Err(ParseError::InvalidDefinitionType { line, desc: r#type.to_string() }),
+            Some(r#type) => return Err(ParseError::InvalidDefinitionType { line, desc: r#type.to_owned() }),
             None => return Err(ParseError::DefinitionTypeMissing { line }),
         };
     }
@@ -134,7 +134,7 @@ fn parse_type_definition<'a>(
 ) -> Result<TypeDefinition, ParseError> {
     let name = def.next()
         .ok_or(ParseError::DefinitionNameMissing { line })?
-        .to_string();
+        .to_owned();
     if type_defined(&name, type_definitions) {
         return Err(ParseError::DuplicateDefinition { line, desc: name });
     }
@@ -143,7 +143,7 @@ fn parse_type_definition<'a>(
 
     let r#enum = def.next()
         .ok_or(ParseError::EnumMissing { line })?
-        .to_string();
+        .to_owned();
 
     Ok(TypeDefinition { id, name, fields, r#enum })
 }
@@ -157,7 +157,7 @@ fn parse_error_definition<'a>(
 ) -> Result<ErrorDefinition, ParseError> {
     let name = def.next()
         .ok_or(ParseError::DefinitionNameMissing { line })?
-        .to_string();
+        .to_owned();
     if error_defined(&name, error_definitions) {
         return Err(ParseError::DuplicateDefinition { line, desc: name });
     }
@@ -177,7 +177,7 @@ fn parse_function_definition<'a>(
 ) -> Result<FunctionDefinition, ParseError> {
     let name = def.next()
         .ok_or(ParseError::DefinitionNameMissing { line })?
-        .to_string();
+        .to_owned();
     if function_defined(&name, function_definitions) {
         return Err(ParseError::DuplicateDefinition { line, desc: name });
     }
@@ -207,7 +207,7 @@ fn parse_fields<'a>(
 
         let name = part.next()
             .ok_or(ParseError::FieldNameMissing { line })?
-            .to_string();
+            .to_owned();
         if field_defined(&name, &fields) {
             return Err(ParseError::DuplicateField { line, desc: name });
         }
@@ -253,8 +253,8 @@ fn parse_type(
                 type_definitions,
                 Some(OuterType::Option),
             )?)),
-        _ if enum_defined(r#type, type_definitions) => Type::Defined(r#type.to_string()),
-        _ => return Err(ParseError::InvalidType { line, field: field.to_string(), desc: r#type.to_string() }),
+        _ if enum_defined(r#type, type_definitions) => Type::Defined(r#type.to_owned()),
+        _ => return Err(ParseError::InvalidType { line, field: field.to_owned(), desc: r#type.to_owned() }),
     };
 
     if let Some(outer) = outer {
@@ -267,7 +267,7 @@ fn parse_type(
         ) {
             return Err(ParseError::InvalidType {
                 line,
-                field: field.to_string(),
+                field: field.to_owned(),
                 desc: format!("invalid nested type: {:?}<{:?}>", outer, r#type),
             });
         }

tl-types/build.rs

@@ -6,8 +6,16 @@ fn main() -> anyhow::Result<()> {
     let out_dir = PathBuf::from(env::var("OUT_DIR")?);
     let out_file = out_dir.join("schema.rs");
 
-    let schema = fs::read_to_string("schema.tl")
-        .context("Failed to read schema.tl")?;
+    let ci = env::var("CI")
+        .unwrap_or_else(|_| String::from("false"))
+        == "true";
+
+    let schema = if ci {
+        String::from("")
+    } else {
+        fs::read_to_string("schema.tl")
+            .context("Failed to read schema.tl")?
+    };
     let schema = tl_parser::parse_schema(&schema)
         .context("Failed to parse schema")?;
     let code = tl_generator::generate(&schema);

tl-types/src/deserialize.rs

@@ -118,7 +118,7 @@ mod tests {
         assert_eq!(de::<f64>(vec![0xbc, 0x90, 0x0e, 0x0f, 0x61, 0x3a, 0x81, 0x40]), 551.297392_f64);
         assert_eq!(de::<bool>(vec![0x1]), true);
         assert_eq!(de::<bool>(vec![0x0]), false);
-        assert_eq!(de::<String>(vec![0x5, b'h', b'e', b'l', b'l', b'o']), "hello".to_string());
+        assert_eq!(de::<String>(vec![0x5, b'h', b'e', b'l', b'l', b'o']), String::from("hello"));
         assert_eq!(
             de::<Vec<u8>>([vec![0xff, 0xe8, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0], vec![0xdd; 997], vec![b'j', b'o', b'y']].concat()),
             [vec![0xdd; 997], vec![b'j', b'o', b'y']].concat()

tl-types/src/serialize.rs

@@ -116,7 +116,7 @@ mod tests {
         assert_eq!(ser(551.297392_f64), vec![0xbc, 0x90, 0x0e, 0x0f, 0x61, 0x3a, 0x81, 0x40]);
         assert_eq!(ser(true), vec![0x1]);
         assert_eq!(ser(false), vec![0x0]);
-        assert_eq!(ser("hello".to_string()), vec![0x5, b'h', b'e', b'l', b'l', b'o']);
+        assert_eq!(ser(String::from("hello")), vec![0x5, b'h', b'e', b'l', b'l', b'o']);
         assert_eq!(
             ser([vec![0xdd; 997], vec![b'j', b'o', b'y']].concat()),
             [vec![0xff, 0xe8, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0], vec![0xdd; 997], vec![b'j', b'o', b'y']].concat()