Merge pull request #254 from lnicola/dont-derive-new

Implement constructors manually instead of using derive-new

Author: nikomatsakis

Cargo.lock

@@ -13,7 +13,6 @@ edition = "2018"
 bench = []
 
 [dependencies]
-derive-new = "0.5.6"
 diff = "0.1.11"
 docopt = "1.0.0"
 failure = "0.1"

Cargo.toml

@@ -10,7 +10,6 @@ keywords = ["compiler", "traits", "prolog"]
 edition = "2018"
 
 [dependencies]
-derive-new = "0.5.6"
 ena = "0.13.0"
 itertools = "0.8.0"
 petgraph = "0.4.13"

chalk-solve/Cargo.toml

@@ -3,15 +3,13 @@ use petgraph::prelude::*;
 use crate::solve::SolverChoice;
 use crate::RustIrDatabase;
 use chalk_ir::{self, Identifier, ImplId, TraitId};
-use derive_new::new;
 use std::collections::BTreeMap;
 use std::fmt;
 use std::sync::Arc;
 
 pub mod orphan;
 mod solve;
 
-#[derive(new)]
 pub struct CoherenceSolver<'db, DB>
 where
     DB: RustIrDatabase,
@@ -73,6 +71,15 @@ impl<'db, DB> CoherenceSolver<'db, DB>
 where
     DB: RustIrDatabase,
 {
+    /// Constructs a new `CoherenceSolver`.
+    pub fn new(db: &'db DB, solver_choice: SolverChoice, trait_id: TraitId) -> Self {
+        Self {
+            db,
+            solver_choice,
+            trait_id,
+        }
+    }
+
     pub fn specialization_priorities(
         &self,
     ) -> Result<Arc<SpecializationPriorities>, CoherenceError> {

chalk-solve/src/coherence.rs

@@ -8,7 +8,6 @@ use chalk_ir::fold::shift::Shift;
 use chalk_ir::fold::*;
 use chalk_ir::*;
 use chalk_rust_ir::*;
-use derive_new::new;
 use itertools::Itertools;
 
 #[derive(Debug)]
@@ -36,7 +35,6 @@ impl fmt::Display for WfError {
 
 impl std::error::Error for WfError {}
 
-#[derive(new)]
 pub struct WfSolver<'db, DB: RustIrDatabase> {
     db: &'db DB,
     solver_choice: SolverChoice,
@@ -122,6 +120,11 @@ impl<'db, DB> WfSolver<'db, DB>
 where
     DB: RustIrDatabase,
 {
+    /// Constructs a new `WfSolver`.
+    pub fn new(db: &'db DB, solver_choice: SolverChoice) -> Self {
+        Self { db, solver_choice }
+    }
+
     pub fn verify_struct_decl(&self, struct_id: StructId) -> Result<(), WfError> {
         let struct_datum = self.db.struct_datum(struct_id);