Skip to content

Commit 0a6f2e2

Browse files
committed
Run cargo fmt with nightly options
1 parent 2df05d2 commit 0a6f2e2

6 files changed

Lines changed: 27 additions & 10 deletions

File tree

src/args2cel.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
use anyhow::{Context, Result, bail};
1+
use anyhow::Context;
2+
use anyhow::Result;
3+
use anyhow::bail;
24
use cel::objects::Value as CelValue;
35
use std::collections::BTreeMap;
46
use std::sync::Arc;

src/cel2json.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use cel::objects::{Key, Value as CelValue};
1+
use cel::objects::Key;
2+
use cel::objects::Value as CelValue;
23
use serde_json::Value as JsonValue;
34

45
/// Convert a CEL value to a serde_json::Value

src/input_handler.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
use anyhow::{Context as AnyhowContext, Result};
1+
use anyhow::Context as AnyhowContext;
2+
use anyhow::Result;
3+
use cel::Context;
4+
use cel::Program;
25
use cel::objects::Value as CelValue;
3-
use cel::{Context, Program};
46
use rayon::prelude::*;
57
use serde_json::Value as JsonValue;
68
use std::collections::BTreeMap;
7-
use std::io::{self, BufRead, BufReader, Cursor, Read};
9+
use std::io::BufRead;
10+
use std::io::BufReader;
11+
use std::io::Cursor;
12+
use std::io::Read;
13+
use std::io::{self};
814

915
use crate::InputParameters;
1016
use crate::cel_value_to_json_value;

src/json2cel.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
use cel::objects::{Key, Value as CelValue};
1+
use cel::objects::Key;
2+
use cel::objects::Value as CelValue;
23
use serde::de::Error as _;
34
use serde_json::Value as JsonValue;
4-
use std::collections::{BTreeMap, HashMap};
5+
use std::collections::BTreeMap;
6+
use std::collections::HashMap;
57
use std::sync::Arc;
68

79
/// Convert a JSON string into a BTreeMap of CEL values.

src/main.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
use anyhow::{Context, Result};
1+
use anyhow::Context;
2+
use anyhow::Result;
23
use cel::Program;
34
use cel::parser::ParseErrors;
45
use clap::Parser;
6+
use std::fs;
7+
use std::io;
58
use std::path::PathBuf;
6-
use std::{fs, io, process};
9+
use std::process;
710

811
mod args2cel;
912
mod cel2json;

tests/golden.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2121
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
// SOFTWARE.
23+
use std::env;
2324
use std::fs;
24-
use std::{env, io, process, str};
25+
use std::io;
26+
use std::process;
27+
use std::str;
2528
use tempfile::NamedTempFile;
2629

2730
fn golden_test(args: &[&str], input: &str, out_ex: &str) -> io::Result<()> {

0 commit comments

Comments
 (0)