diesel-cli: 1.4.0 -> 1.4.1
This commit is contained in:
parent
9cc8c600c6
commit
44479cefbd
4 changed files with 661 additions and 820 deletions
|
@ -1,88 +0,0 @@
|
|||
diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs
|
||||
index 4e743eb4..97c53ed8 100644
|
||||
--- a/diesel/src/lib.rs
|
||||
+++ b/diesel/src/lib.rs
|
||||
@@ -131,7 +131,6 @@
|
||||
#![cfg_attr(feature = "unstable", feature(specialization, try_from))]
|
||||
// Built-in Lints
|
||||
#![deny(
|
||||
- warnings,
|
||||
missing_debug_implementations,
|
||||
missing_copy_implementations,
|
||||
missing_docs
|
||||
diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs
|
||||
index 741ca003..cf93bb8f 100644
|
||||
--- a/diesel_cli/src/main.rs
|
||||
+++ b/diesel_cli/src/main.rs
|
||||
@@ -1,5 +1,5 @@
|
||||
// Built-in Lints
|
||||
-#![deny(warnings, missing_copy_implementations)]
|
||||
+#![deny(missing_copy_implementations)]
|
||||
// Clippy lints
|
||||
#![allow(clippy::option_map_unwrap_or_else, clippy::option_map_unwrap_or)]
|
||||
#![warn(
|
||||
diff --git a/diesel_cli/tests/tests.rs b/diesel_cli/tests/tests.rs
|
||||
index 2edee846..c96917c4 100644
|
||||
--- a/diesel_cli/tests/tests.rs
|
||||
+++ b/diesel_cli/tests/tests.rs
|
||||
@@ -1,5 +1,3 @@
|
||||
-#![deny(warnings)]
|
||||
-
|
||||
extern crate chrono;
|
||||
extern crate diesel;
|
||||
#[macro_use]
|
||||
diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs
|
||||
index 2c43b2a3..44dcf3f9 100644
|
||||
--- a/diesel_derives/src/lib.rs
|
||||
+++ b/diesel_derives/src/lib.rs
|
||||
@@ -1,6 +1,6 @@
|
||||
#![recursion_limit = "1024"]
|
||||
// Built-in Lints
|
||||
-#![deny(warnings, missing_copy_implementations)]
|
||||
+#![deny(missing_copy_implementations)]
|
||||
// Clippy lints
|
||||
#![allow(
|
||||
clippy::needless_pass_by_value,
|
||||
diff --git a/diesel_derives/tests/tests.rs b/diesel_derives/tests/tests.rs
|
||||
index 636fea66..f86f3dcc 100644
|
||||
--- a/diesel_derives/tests/tests.rs
|
||||
+++ b/diesel_derives/tests/tests.rs
|
||||
@@ -1,5 +1,3 @@
|
||||
-#![deny(warnings)]
|
||||
-
|
||||
#[macro_use]
|
||||
extern crate cfg_if;
|
||||
#[macro_use]
|
||||
diff --git a/diesel_migrations/migrations_internals/src/lib.rs b/diesel_migrations/migrations_internals/src/lib.rs
|
||||
index 933e21a8..7c4d0222 100644
|
||||
--- a/diesel_migrations/migrations_internals/src/lib.rs
|
||||
+++ b/diesel_migrations/migrations_internals/src/lib.rs
|
||||
@@ -1,5 +1,5 @@
|
||||
// Built-in Lints
|
||||
-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
|
||||
+#![deny(missing_debug_implementations, missing_copy_implementations)]
|
||||
// Clippy lints
|
||||
#![allow(
|
||||
clippy::option_map_unwrap_or_else,
|
||||
diff --git a/diesel_migrations/migrations_macros/src/lib.rs b/diesel_migrations/migrations_macros/src/lib.rs
|
||||
index 0a83234e..2f509c04 100644
|
||||
--- a/diesel_migrations/migrations_macros/src/lib.rs
|
||||
+++ b/diesel_migrations/migrations_macros/src/lib.rs
|
||||
@@ -1,5 +1,5 @@
|
||||
// Built-in Lints
|
||||
-#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
|
||||
+#![deny(missing_debug_implementations, missing_copy_implementations)]
|
||||
// Clippy lints
|
||||
#![allow(
|
||||
clippy::option_map_unwrap_or_else,
|
||||
diff --git a/diesel_migrations/src/lib.rs b/diesel_migrations/src/lib.rs
|
||||
index c85414e5..f025f237 100644
|
||||
--- a/diesel_migrations/src/lib.rs
|
||||
+++ b/diesel_migrations/src/lib.rs
|
||||
@@ -1,5 +1,5 @@
|
||||
// Built-in Lints
|
||||
-#![deny(warnings, missing_copy_implementations)]
|
||||
+#![deny(missing_copy_implementations)]
|
||||
// Clippy lints
|
||||
#![allow(
|
||||
clippy::needless_pass_by_value,
|
File diff suppressed because it is too large
Load diff
|
@ -16,26 +16,37 @@ in
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diesel-cli";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diesel-rs";
|
||||
repo = "diesel";
|
||||
rev = "v${version}";
|
||||
sha256 = "0wp4hvpl9cf8hw1jyz3z476k5blrh6srfpv36dw10bj126rz9pvb";
|
||||
# diesel and diesel_cli are independently versioned. diesel_cli
|
||||
# 1.4.1 first became available in diesel 1.4.5, but we can use
|
||||
# a newer diesel tag.
|
||||
rev = "v1.4.6";
|
||||
sha256 = "0c8a2f250mllzpr20j7j0msbf2csjf9dj8g7j6cl04ifdg7gwb9z";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Allow warnings to fix many instances of `error: trait objects without an explicit `dyn` are deprecated`
|
||||
#
|
||||
# Remove this after https://github.com/diesel-rs/diesel/commit/9004d1c3fa12aaee84986bd3d893002491373f8c
|
||||
# is in a release.
|
||||
./allow-warnings.patch
|
||||
# Fixes:
|
||||
# Compiling diesel v1.4.6 (/build/source/diesel)
|
||||
# error: this `#[deprecated]` annotation has no effect
|
||||
# --> diesel/src/query_builder/insert_statement/mod.rs:205:1
|
||||
# |
|
||||
# 205 | / #[deprecated(
|
||||
# 206 | | since = "1.2.0",
|
||||
# 207 | | note = "Use `<&'a [U] as Insertable<T>>::Values` instead"
|
||||
# 208 | | )]
|
||||
# | |__^ help: remove the unnecessary deprecation attribute
|
||||
# |
|
||||
# = note: `#[deny(useless_deprecated)]` on by default
|
||||
./fix-deprecated.patch
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g";
|
||||
cargoSha256 = "1vkwp861vm20agj0lkhnnxgg4vwg4d5clvvyzxrmm4y4yw46cdl2";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
10
pkgs/development/tools/diesel-cli/fix-deprecated.patch
Normal file
10
pkgs/development/tools/diesel-cli/fix-deprecated.patch
Normal file
|
@ -0,0 +1,10 @@
|
|||
diff --git a/diesel/src/query_builder/insert_statement/mod.rs b/diesel/src/query_builder/insert_statement/mod.rs
|
||||
index b6bb34df9d..7486eb7a59 100644
|
||||
--- a/diesel/src/query_builder/insert_statement/mod.rs
|
||||
+++ b/diesel/src/query_builder/insert_statement/mod.rs
|
||||
@@ -1,3 +1,5 @@
|
||||
+#![allow(useless_deprecated)]
|
||||
+
|
||||
mod column_list;
|
||||
mod insert_from_select;
|
||||
|
Loading…
Reference in a new issue