Skip to content

Commit 2650518

Browse files
authored
[workerd-cxx] just format (#34)
1 parent 77fcc4d commit 2650518

34 files changed

+181
-76
lines changed

gen/build/src/cfg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,13 +342,13 @@ pub use self::r#impl::Cfg::CFG;
342342
#[cfg(not(doc))]
343343
mod r#impl {
344344
use crate::intern::{intern, InternedString};
345-
use syntax::map::UnorderedMap as Map;
346345
use crate::vec::{self, InternedVec as _};
347346
use std::cell::RefCell;
348347
use std::fmt::{self, Debug};
349348
use std::marker::PhantomData;
350349
use std::ops::{Deref, DerefMut};
351350
use std::sync::{OnceLock, PoisonError, RwLock};
351+
use syntax::map::UnorderedMap as Map;
352352

353353
struct CurrentCfg {
354354
include_prefix: InternedString,

gen/build/src/intern.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use syntax::set::UnorderedSet as Set;
21
use std::sync::{Mutex, OnceLock, PoisonError};
2+
use syntax::set::UnorderedSet as Set;
33

44
#[derive(Copy, Clone, Default)]
55
pub(crate) struct InternedString(&'static str);

gen/build/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,19 @@ mod vec;
9090
use crate::cargo::CargoEnvCfgEvaluator;
9191
use crate::deps::{Crate, HeaderDir};
9292
use crate::error::{Error, Result};
93-
use gen::error::report;
94-
use gen::Opt;
9593
use crate::paths::PathExt;
96-
use syntax::map::{Entry, UnorderedMap};
9794
use crate::target::TargetDir;
9895
use cc::Build;
96+
use gen::error::report;
97+
use gen::Opt;
9998
use std::collections::BTreeSet;
10099
use std::env;
101100
use std::ffi::{OsStr, OsString};
102101
use std::io::{self, Write};
103102
use std::iter;
104103
use std::path::{Path, PathBuf};
105104
use std::process;
105+
use syntax::map::{Entry, UnorderedMap};
106106

107107
pub use crate::cfg::{Cfg, CFG};
108108

gen/build/src/out.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::error::{Error, Result};
2-
use gen::fs;
32
use crate::paths;
3+
use gen::fs;
44
use std::path::{Component, Path, PathBuf};
55
use std::{env, io};
66

gen/cmd/src/app.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ mod test;
44

55
use super::{Opt, Output};
66
use crate::cfg::{self, CfgValue};
7-
use gen::include::Include;
8-
use syntax::IncludeKind;
97
use clap::builder::{ArgAction, ValueParser};
108
use clap::{Arg, Command};
9+
use gen::include::Include;
1110
use std::collections::{BTreeMap as Map, BTreeSet as Set};
1211
use std::path::PathBuf;
1312
use std::process;
1413
use std::sync::{Arc, Mutex, PoisonError};
1514
use syn::parse::Parser;
15+
use syntax::IncludeKind;
1616

1717
const USAGE: &str = "\
1818
cxxbridge <input>.rs Emit .cc file for bridge to stdout

gen/cmd/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ mod cfg;
2929
mod output;
3030

3131
use crate::cfg::{CfgValue, FlagsCfgEvaluator};
32+
use crate::output::Output;
3233
use gen::error::{report, Result};
3334
use gen::fs;
3435
use gen::include::{self, Include};
35-
use crate::output::Output;
3636
use std::collections::{BTreeMap as Map, BTreeSet as Set};
3737
use std::io::{self, Write};
3838
use std::path::PathBuf;

gen/lib/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ mod error;
4242
pub use crate::error::Error;
4343
pub use gen::include::{Include, HEADER};
4444
pub use gen::{CfgEvaluator, CfgResult, GeneratedCode, Opt};
45-
pub use syntax::IncludeKind;
4645
use proc_macro2::TokenStream;
46+
pub use syntax::IncludeKind;
4747

4848
/// Generate C++ bindings code from a Rust token stream. This should be a Rust
4949
/// token stream which somewhere contains a `#[cxx::bridge] mod {}`.

gen/src/cfg.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use crate::{CfgEvaluator, CfgResult};
2-
use syntax::cfg::CfgExpr;
3-
use syntax::report::Errors;
4-
use syntax::Api;
52
use quote::quote;
63
use std::collections::BTreeSet as Set;
74
use syn::{Error, LitStr};
5+
use syntax::cfg::CfgExpr;
6+
use syntax::report::Errors;
7+
use syntax::Api;
88

99
pub struct UnsupportedCfgEvaluator;
1010

gen/src/check.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::Opt;
2-
use syntax::report::Errors;
3-
use syntax::{error, Api};
42
use quote::{quote, quote_spanned};
53
use std::path::{Component, Path};
4+
use syntax::report::Errors;
5+
use syntax::{error, Api};
66

77
pub use syntax::check::{typecheck, Generator};
88

gen/src/file.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use syntax::file::Module;
2-
use syntax::namespace::Namespace;
31
use syn::parse::discouraged::Speculative;
42
use syn::parse::{Error, Parse, ParseStream, Result};
53
use syn::{braced, Attribute, Ident, Item, Meta, Token, Visibility};
4+
use syntax::file::Module;
5+
use syntax::namespace::Namespace;
66

77
pub struct File {
88
pub modules: Vec<Module>,

0 commit comments

Comments
 (0)