don't replace std Result

This commit is contained in:
Quaternions 2023-09-13 21:03:17 -07:00
parent 1a6202ae66
commit 2a55ef90df
2 changed files with 15 additions and 16 deletions

View File

@ -95,7 +95,7 @@ fn get_script_refs(dom:&rbx_dom_weak::WeakDom) -> Vec<rbx_dom_weak::types::Ref>{
scripts
}
fn get_id() -> Result<u32>{
fn get_id() -> BoxResult<u32>{
match std::fs::read_to_string("id"){
Ok(id_file)=>Ok(id_file.parse::<u32>()?),
Err(e) => match e.kind() {
@ -105,7 +105,7 @@ fn get_id() -> Result<u32>{
}
}
fn get_set_from_file(file:&str) -> Result<std::collections::HashSet<String>>{
fn get_set_from_file(file:&str) -> BoxResult<std::collections::HashSet<String>>{
let mut set=std::collections::HashSet::<String>::new();
for entry in std::fs::read_dir(file)? {
set.insert(std::fs::read_to_string(entry?.path())?);
@ -113,15 +113,15 @@ fn get_set_from_file(file:&str) -> Result<std::collections::HashSet<String>>{
Ok(set)
}
fn get_allowed_set() -> Result<std::collections::HashSet<String>>{
fn get_allowed_set() -> BoxResult<std::collections::HashSet<String>>{
get_set_from_file("scripts/allowed")
}
fn get_blocked() -> Result<std::collections::HashSet<String>>{
fn get_blocked() -> BoxResult<std::collections::HashSet<String>>{
get_set_from_file("scripts/blocked")
}
fn get_allowed_map() -> Result<std::collections::HashMap::<u32,String>>{
fn get_allowed_map() -> BoxResult<std::collections::HashMap::<u32,String>>{
let mut allowed_map = std::collections::HashMap::<u32,String>::new();
for entry in std::fs::read_dir("scripts/allowed")? {
let entry=entry?;
@ -130,7 +130,7 @@ fn get_allowed_map() -> Result<std::collections::HashMap::<u32,String>>{
Ok(allowed_map)
}
fn get_replace_map() -> Result<std::collections::HashMap::<String,u32>>{
fn get_replace_map() -> BoxResult<std::collections::HashMap::<String,u32>>{
let mut replace = std::collections::HashMap::<String,u32>::new();
for entry in std::fs::read_dir("scripts/replace")? {
let entry=entry?;
@ -143,7 +143,7 @@ fn check_source_illegal_keywords(source:&String)->bool{
source.find("getfenv").is_some()||source.find("require").is_some()
}
fn download(map_list: Vec<u64>) -> Result<()>{
fn download(map_list: Vec<u64>) -> BoxResult<()>{
let header=format!("Cookie: .ROBLOSECURITY={}",std::env::var("RBXCOOKIE")?);
let shared_args=&[
"-q",
@ -167,7 +167,7 @@ enum Scan{
Flagged,
}
fn scan() -> Result<()>{
fn scan() -> BoxResult<()>{
let mut id = get_id()?;
//Construct allowed scripts
let allowed_set = get_allowed_set()?;
@ -225,7 +225,7 @@ fn scan() -> Result<()>{
std::fs::write("id",id.to_string())?;
Ok(())
}
fn extract(file_id:u64) -> Result<()>{
fn extract(file_id:u64) -> BoxResult<()>{
let mut id = 0;
//Construct allowed scripts
let mut script_set = std::collections::HashSet::<String>::new();
@ -265,7 +265,7 @@ fn extract(file_id:u64) -> Result<()>{
println!("extracted {} {}",id,if id==1 {"script"}else{"scripts"});
Ok(())
}
fn replace() -> Result<()>{
fn replace() -> BoxResult<()>{
let allowed_map=get_allowed_map()?;
let replace_map=get_replace_map()?;
@ -313,7 +313,7 @@ fn replace() -> Result<()>{
}
Ok(())
}
fn upload() -> Result<()>{
fn upload() -> BoxResult<()>{
//interactive prompt per upload:
//Creator: [auto fill creator]
//DisplayName: [auto fill DisplayName]
@ -348,7 +348,7 @@ enum ScriptActionParseResult {
struct ParseScriptActionErr;
impl std::str::FromStr for ScriptActionParseResult {
type Err=ParseScriptActionErr;
fn from_str(s: &str) -> StdResult<Self, Self::Err>{
fn from_str(s: &str) -> Result<Self, Self::Err>{
if s=="pass\n"||s=="1\n"{
Ok(Self::Pass)
}else if s=="block\n"{
@ -363,7 +363,7 @@ impl std::str::FromStr for ScriptActionParseResult {
}
}
fn interactive() -> Result<()>{
fn interactive() -> BoxResult<()>{
let mut id=get_id()?;
//Construct allowed scripts
let mut allowed_set=get_allowed_set()?;
@ -528,7 +528,7 @@ fn interactive() -> Result<()>{
Ok(())
}
fn main() -> Result<()> {
fn main() -> BoxResult<()> {
let cli = Cli::parse();
match cli.command {
Commands::Download(map_list)=>download(map_list.maps),

View File

@ -1,7 +1,6 @@
pub use crate::error::Error;
pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
pub type StdResult<T, E> = std::result::Result<T, E>;
pub type BoxResult<T> = std::result::Result<T, Box<dyn std::error::Error>>;
// i just wanted to mess around with macros a bit
// so heres labelprint as a macro