diff options
| -rw-r--r-- | dhall/src/lib.rs | 6 | ||||
| -rw-r--r-- | dhall/src/phase/normalize.rs | 2 | ||||
| -rw-r--r-- | dhall/src/phase/resolve.rs | 3 | ||||
| -rw-r--r-- | dhall/src/phase/typecheck.rs | 2 | ||||
| -rw-r--r-- | dhall/src/tests.rs | 2 | ||||
| -rw-r--r-- | serde_dhall/tests/traits.rs | 1 |
6 files changed, 4 insertions, 12 deletions
diff --git a/dhall/src/lib.rs b/dhall/src/lib.rs index c360323..d40fbda 100644 --- a/dhall/src/lib.rs +++ b/dhall/src/lib.rs @@ -1,13 +1,7 @@ #![feature(trace_macros)] -#![feature(proc_macro_hygiene)] #![feature(slice_patterns)] -#![feature(label_break_value)] #![feature(non_exhaustive)] -#![feature(bind_by_move_pattern_guards)] -#![feature(try_trait)] -#![feature(inner_deref)] #![feature(never_type)] -#![cfg_attr(test, feature(custom_inner_attributes))] #![allow( clippy::type_complexity, clippy::infallible_destructuring_match, diff --git a/dhall/src/phase/normalize.rs b/dhall/src/phase/normalize.rs index f11269e..02406f2 100644 --- a/dhall/src/phase/normalize.rs +++ b/dhall/src/phase/normalize.rs @@ -752,7 +752,7 @@ pub fn normalize_one_layer(expr: ExprF<Thunk, Normalized>) -> Value { None => Ret::Expr(expr), }, - ExprF::Projection(_, ls) if ls.is_empty() => { + ExprF::Projection(_, ref ls) if ls.is_empty() => { Ret::Value(RecordLit(HashMap::new())) } ExprF::Projection(ref v, ref ls) => { diff --git a/dhall/src/phase/resolve.rs b/dhall/src/phase/resolve.rs index 52353e4..dabecf2 100644 --- a/dhall/src/phase/resolve.rs +++ b/dhall/src/phase/resolve.rs @@ -105,9 +105,8 @@ pub fn skip_resolve_expr( } #[cfg(test)] +#[rustfmt::skip] mod spec_tests { - #![rustfmt::skip] - macro_rules! import_success { ($name:ident, $path:expr) => { make_spec_test!(Import, Success, $name, &("../dhall-lang/tests/import/success/".to_owned() + $path)); diff --git a/dhall/src/phase/typecheck.rs b/dhall/src/phase/typecheck.rs index 89e2da8..5eab8da 100644 --- a/dhall/src/phase/typecheck.rs +++ b/dhall/src/phase/typecheck.rs @@ -438,7 +438,7 @@ fn type_last_layer( } Assert(t) => { match t.to_value() { - Value::Equivalence(x, y) if x == y => {} + Value::Equivalence(ref x, ref y) if x == y => {} Value::Equivalence(x, y) => { return Err(mkerr(AssertMismatch( x.to_typed(), diff --git a/dhall/src/tests.rs b/dhall/src/tests.rs index 15bc97a..d269523 100644 --- a/dhall/src/tests.rs +++ b/dhall/src/tests.rs @@ -204,7 +204,7 @@ pub fn run_test( match feature { Parser => { let err = parse_file_str(&file_path).unwrap_err(); - match err { + match &err { Error::Parse(_) => {} Error::IO(e) if e.kind() == std::io::ErrorKind::InvalidData => {} diff --git a/serde_dhall/tests/traits.rs b/serde_dhall/tests/traits.rs index 55be63b..15a91ed 100644 --- a/serde_dhall/tests/traits.rs +++ b/serde_dhall/tests/traits.rs @@ -1,4 +1,3 @@ -#![feature(proc_macro_hygiene)] use serde_dhall::{from_str, StaticType, Value}; #[test] |