Skip to content

Commit

Permalink
chore(fmt): re-format use statements after rename
Browse files Browse the repository at this point in the history
  • Loading branch information
dnaka91 committed Jan 4, 2024
1 parent 92479fe commit b18a4bd
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions crates/mabo-build/src/decode.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use proc_macro2::{Ident, Span, TokenStream};
use quote::quote;
use mabo_compiler::simplify::{
Enum, ExternalType, Field, FieldKind, Fields, Struct, Type, Variant,
};
use proc_macro2::{Ident, Span, TokenStream};
use quote::quote;

use crate::{BytesType, Opts};

Expand Down
4 changes: 2 additions & 2 deletions crates/mabo-build/src/definition.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use proc_macro2::{Ident, Span, TokenStream};
use quote::{quote, ToTokens};
use mabo_compiler::simplify::{
Const, Definition, Enum, ExternalType, Field, FieldKind, Fields, Import, Literal, Module,
Schema, Struct, Type, TypeAlias, Variant,
};
use proc_macro2::{Ident, Span, TokenStream};
use quote::{quote, ToTokens};

use super::{decode, encode, size};
use crate::{BytesType, Opts};
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-build/src/encode.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use mabo_compiler::simplify::{Enum, Field, FieldKind, Fields, Struct, Type, Variant};
use proc_macro2::{Ident, Span, TokenStream};
use quote::{quote, ToTokens};
use mabo_compiler::simplify::{Enum, Field, FieldKind, Fields, Struct, Type, Variant};

use crate::{BytesType, Opts};

Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

use std::{convert::AsRef, env, fmt::Debug, fs, path::PathBuf};

use miette::Report;
use mabo_parser::Schema;
use miette::Report;
use thiserror::Error;

pub use self::definition::compile_schema;
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-build/src/size.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use mabo_compiler::simplify::{Enum, Field, FieldKind, Fields, Struct, Type, Variant};
use proc_macro2::{Ident, Span, TokenStream};
use quote::{quote, ToTokens};
use mabo_compiler::simplify::{Enum, Field, FieldKind, Fields, Struct, Type, Variant};

use crate::{BytesType, Opts};

Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

use std::{fs, process::ExitCode};

use miette::{Context, IntoDiagnostic, Result};
use mabo_parser::Schema;
use miette::{Context, IntoDiagnostic, Result};

use self::cli::Cli;

Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-compiler/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

#![allow(clippy::module_name_repetitions)]

use mabo_parser::Spanned;
pub use resolve::schemas as resolve_schemas;
pub use simplify::schema as simplify_schema;
use mabo_parser::Spanned;
pub use validate::schema as validate_schema;

mod highlight;
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-compiler/src/resolve/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

use std::collections::HashMap;

use miette::NamedSource;
use mabo_parser::{
DataType, Definition, ExternalType, Fields, Generics, Import, Name, Schema, Spanned, Type,
};
use miette::NamedSource;

pub use self::error::{
Error, GenericsCount, InvalidKind, MissingDefinition, MissingImport, MissingModule,
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-compiler/src/validate/generics.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{collections::HashMap, ops::Range};

use miette::Diagnostic;
use mabo_parser::{DataType, Enum, ExternalType, Fields, Generics, Span, Spanned, Struct, Type};
use miette::Diagnostic;
use thiserror::Error;

/// Generic type parameters are considered invalid.
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-compiler/src/validate/ids.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{collections::HashMap, ops::Range};

use miette::Diagnostic;
use mabo_parser::{Enum, Fields, Id, Spanned, Struct};
use miette::Diagnostic;
use thiserror::Error;

use crate::IdGenerator;
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-compiler/src/validate/mod.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! Ensure several conditions for a single schema are met, which are difficult to verify during the
//! parsing step.

use miette::Diagnostic;
use mabo_parser::{Definition, Schema};
use miette::Diagnostic;
use thiserror::Error;

pub use self::{
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-compiler/src/validate/names.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{collections::HashMap, ops::Range};

use miette::Diagnostic;
use mabo_parser::{Definition, Enum, Fields, Import, Spanned, Struct};
use miette::Diagnostic;
use thiserror::Error;

/// Duplicate name was encountered for two elements in the same scope.
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-compiler/src/validate/tuples.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::ops::Range;

use miette::{diagnostic, Diagnostic};
use mabo_parser::{Const, DataType, Enum, Fields, Spanned, Struct, Type, TypeAlias};
use miette::{diagnostic, Diagnostic};
use thiserror::Error;

use crate::highlight;
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-compiler/tests/compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use std::{
};

use insta::{assert_snapshot, glob, with_settings};
use miette::{Diagnostic, MietteHandler, MietteHandlerOpts, NamedSource, Report, ReportHandler};
use mabo_parser::Schema;
use miette::{Diagnostic, MietteHandler, MietteHandlerOpts, NamedSource, Report, ReportHandler};

struct Wrapper<'a>(&'a MietteHandler, &'a dyn Diagnostic);

Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-lsp/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ use anyhow::{ensure, Context, Result};
use line_index::LineIndex;
use log::{as_debug, debug};
use lsp_types::{ConfigurationItem, Diagnostic, Url};
use mabo_parser::Schema;
use ouroboros::self_referencing;
use ropey::Rope;
use mabo_parser::Schema;

use crate::{client::Client, config};

Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-parser/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ use std::{
path::{Path, PathBuf},
};

use mabo_derive::Debug;
pub use miette::{Diagnostic, LabeledSpan};
use miette::{IntoDiagnostic, NamedSource, Result};
use mabo_derive::Debug;
use winnow::Parser;

use self::error::ParseSchemaError;
Expand Down
2 changes: 1 addition & 1 deletion crates/mabo-parser/tests/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use std::{
};

use insta::{assert_snapshot, glob, with_settings};
use miette::{Diagnostic, MietteHandler, MietteHandlerOpts, ReportHandler};
use mabo_parser::Schema;
use miette::{Diagnostic, MietteHandler, MietteHandlerOpts, ReportHandler};

fn strip_path(path: &Path) -> PathBuf {
path.strip_prefix(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/inputs"))
Expand Down

0 comments on commit b18a4bd

Please sign in to comment.