Skip to content

style: format code with Rustfmt #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

style: format code with Rustfmt #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
386 changes: 194 additions & 192 deletions auto_context/src/lib.rs
View file
Open in desktop

Large diffs are not rendered by default.

398 changes: 204 additions & 194 deletions src/gui.rs
View file
Open in desktop

Large diffs are not rendered by default.

218 changes: 112 additions & 106 deletions src/io_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,135 +11,141 @@ use std::io;
use std::{fs, io::Read};

pub fn read_as_entity(path: &str) -> Entity {
serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
let mut vec = Vec::new();
fs::File::open(path)
.expect("Failed to open file")
.read_to_end(&mut vec)
.expect("Failed to read file");
vec
}))
.unwrap_or_else(|x| panic!("Failed to parse file: {}", x))
serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
let mut vec = Vec::new();
fs::File::open(path)
.expect("Failed to open file")
.read_to_end(&mut vec)
.expect("Failed to read file");
vec
}))
.unwrap_or_else(|x| panic!("Failed to parse file: {}", x))
}

pub fn read_as_rtfactory(path: &str) -> RTFactory {
let val: Value = serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
let mut vec = Vec::new();
fs::File::open(path)
.expect("Failed to open file")
.read_to_end(&mut vec)
.expect("Failed to read file");
vec
}))
.unwrap_or_else(|x| panic!("Failed to parse file: {}", x));

if val.get("entityTemplates").is_some() {
convert_2016_factory_to_modern(&from_value(val).expect("Failed to read file as RT struct"))
} else {
from_value(val).expect("Failed to read file as RT struct")
}
let val: Value =
serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
let mut vec = Vec::new();
fs::File::open(path)
.expect("Failed to open file")
.read_to_end(&mut vec)
.expect("Failed to read file");
vec
}))
.unwrap_or_else(|x| panic!("Failed to parse file: {}", x));

if val.get("entityTemplates").is_some() {
convert_2016_factory_to_modern(&from_value(val).expect("Failed to read file as RT struct"))
} else {
from_value(val).expect("Failed to read file as RT struct")
}
}

pub fn read_as_rtblueprint(path: &str) -> RTBlueprint {
let val: Value = serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
let mut vec = Vec::new();
fs::File::open(path)
.expect("Failed to open file")
.read_to_end(&mut vec)
.expect("Failed to read file");
vec
}))
.unwrap_or_else(|x| panic!("Failed to parse file: {}", x));

if val.get("entityTemplates").is_some() {
convert_2016_blueprint_to_modern(&from_value(val).expect("Failed to read file as RT struct"))
} else {
from_value(val).expect("Failed to read file as RT struct")
}
let val: Value =
serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
let mut vec = Vec::new();
fs::File::open(path)
.expect("Failed to open file")
.read_to_end(&mut vec)
.expect("Failed to read file");
vec
}))
.unwrap_or_else(|x| panic!("Failed to parse file: {}", x));

if val.get("entityTemplates").is_some() {
convert_2016_blueprint_to_modern(
&from_value(val).expect("Failed to read file as RT struct"),
)
} else {
from_value(val).expect("Failed to read file as RT struct")
}
}

pub fn read_as_meta(path: &str) -> ResourceMeta {
serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
let mut vec = Vec::new();
fs::File::open(path)
.expect("Failed to open file")
.read_to_end(&mut vec)
.expect("Failed to read file");
vec
}))
.unwrap_or_else(|x| panic!("Failed to parse file: {}", x))
serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
let mut vec = Vec::new();
fs::File::open(path)
.expect("Failed to open file")
.read_to_end(&mut vec)
.expect("Failed to read file");
vec
}))
.unwrap_or_else(|x| panic!("Failed to parse file: {}", x))
}

pub fn read_as_patch(path: &str) -> Patch {
serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
let mut vec = Vec::new();
fs::File::open(path)
.expect("Failed to open file")
.read_to_end(&mut vec)
.expect("Failed to read file");
vec
}))
.unwrap_or_else(|x| panic!("Failed to parse file: {}", x))
serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
let mut vec = Vec::new();
fs::File::open(path)
.expect("Failed to open file")
.read_to_end(&mut vec)
.expect("Failed to read file");
vec
}))
.unwrap_or_else(|x| panic!("Failed to parse file: {}", x))
}

pub fn to_vec_float_format<W>(contents: &W) -> Vec<u8>
where
W: ?Sized + Serialize
W: ?Sized + Serialize,
{
let mut writer = Vec::with_capacity(128);
let mut writer = Vec::with_capacity(128);

let mut ser = Serializer::with_formatter(&mut writer, FloatFormatter);
contents.serialize(&mut ser).unwrap();
let mut ser = Serializer::with_formatter(&mut writer, FloatFormatter);
contents.serialize(&mut ser).unwrap();

writer
writer
}

#[derive(Clone, Debug)]
struct FloatFormatter;

impl Formatter for FloatFormatter {
#[inline]
fn write_f32<W>(&mut self, writer: &mut W, value: f32) -> io::Result<()>
where
W: ?Sized + io::Write
{
writer.write_all(value.to_string().as_bytes())
}

#[inline]
fn write_f64<W>(&mut self, writer: &mut W, value: f64) -> io::Result<()>
where
W: ?Sized + io::Write
{
writer.write_all(value.to_string().as_bytes())
}

/// Writes a number that has already been rendered to a string.
#[inline]
fn write_number_str<W>(&mut self, writer: &mut W, value: &str) -> io::Result<()>
where
W: ?Sized + io::Write
{
let x = value.parse::<f64>();
if let Ok(y) = x {
if value.parse::<u64>().is_err() || y.to_string() == value.parse::<u64>().unwrap().to_string() {
writer
.write_all(
if y.to_string() == "-0" {
"0".to_string()
} else {
y.to_string()
}
.as_bytes()
)
.unwrap();
} else {
writer.write_all(value.as_bytes()).unwrap();
}
} else {
writer.write_all(value.as_bytes()).unwrap();
}

Ok(())
}
#[inline]
fn write_f32<W>(&mut self, writer: &mut W, value: f32) -> io::Result<()>
where
W: ?Sized + io::Write,
{
writer.write_all(value.to_string().as_bytes())
}

#[inline]
fn write_f64<W>(&mut self, writer: &mut W, value: f64) -> io::Result<()>
where
W: ?Sized + io::Write,
{
writer.write_all(value.to_string().as_bytes())
}

/// Writes a number that has already been rendered to a string.
#[inline]
fn write_number_str<W>(&mut self, writer: &mut W, value: &str) -> io::Result<()>
where
W: ?Sized + io::Write,
{
let x = value.parse::<f64>();
if let Ok(y) = x {
if value.parse::<u64>().is_err()
|| y.to_string() == value.parse::<u64>().unwrap().to_string()
{
writer
.write_all(
if y.to_string() == "-0" {
"0".to_string()
} else {
y.to_string()
}
.as_bytes(),
)
.unwrap();
} else {
writer.write_all(value.as_bytes()).unwrap();
}
} else {
writer.write_all(value.as_bytes()).unwrap();
}

Ok(())
}
}
Loading