From 23726fe83d4f82057b708c34cc2eaf067655a0b9 Mon Sep 17 00:00:00 2001
From: Luca Palmieri <20745048+LukeMathWalker@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:05:18 +0200
Subject: [PATCH] chore: Fix (some) warnings in UI tests

---
 .../src/lib.rs                                |  2 +-
 .../expectations/stderr.txt                   | 32 ++++++++---------
 .../src/lib.rs                                | 14 +++-----
 .../src/lib.rs                                | 12 ++-----
 .../src/lib.rs                                | 18 +++-------
 .../src/lib.rs                                | 18 +++-------
 .../expectations/stderr.txt                   | 24 ++++++-------
 .../src/lib.rs                                | 12 +++----
 .../src/lib.rs                                | 12 ++-----
 .../src/lib.rs                                | 15 +++-----
 .../src/lib.rs                                | 15 +++-----
 .../a_copy_type_can_be_moved_twice/src/lib.rs | 15 +++-----
 .../expectations/stderr.txt                   | 24 ++++++-------
 .../src/lib.rs                                | 10 ++----
 .../expectations/stderr.txt                   | 36 +++++++++----------
 .../src/lib.rs                                | 10 +++---
 .../expectations/stderr.txt                   | 36 +++++++++----------
 .../src/lib.rs                                | 10 +++---
 .../expectations/stderr.txt                   | 20 +++++------
 .../src/lib.rs                                | 10 ++----
 .../borrow_checker/mutability/src/lib.rs      |  8 ++---
 .../expectations/stderr.txt                   | 12 +++----
 .../transitive_borrows/src/lib.rs             | 10 +++---
 .../src/lib.rs                                | 10 ++----
 .../src/lib.rs                                | 13 ++-----
 .../src/lib.rs                                | 13 ++-----
 .../src/lib.rs                                | 13 ++-----
 .../src/lib.rs                                |  4 +--
 .../expectations/stderr.txt                   | 12 +++----
 .../src/lib.rs                                |  8 ++---
 .../expectations/stderr.txt                   | 12 +++----
 .../src/lib.rs                                |  8 ++---
 .../src/lib.rs                                | 11 ++----
 33 files changed, 183 insertions(+), 296 deletions(-)

diff --git a/libs/ui_tests/borrow_checker/cannot_borrow_clonable_request_scoped_as_mut/src/lib.rs b/libs/ui_tests/borrow_checker/cannot_borrow_clonable_request_scoped_as_mut/src/lib.rs
index 35611e1cd..936b7441c 100644
--- a/libs/ui_tests/borrow_checker/cannot_borrow_clonable_request_scoped_as_mut/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/cannot_borrow_clonable_request_scoped_as_mut/src/lib.rs
@@ -1,4 +1,4 @@
-use pavex::blueprint::{constructor::CloningStrategy, router::GET, Blueprint};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
diff --git a/libs/ui_tests/borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/expectations/stderr.txt b/libs/ui_tests/borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/expectations/stderr.txt
index 767d965d6..145821d7a 100644
--- a/libs/ui_tests/borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/expectations/stderr.txt
+++ b/libs/ui_tests/borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/expectations/stderr.txt
@@ -14,31 +14,31 @@
   │         You can do so by invoking `.cloning(CloningStrategy::CloneIfNecessary)`
   │         on the type returned by `.constructor`.
   │        ☞
-  │           ╭─[borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/src/lib.rs:65:1]
-  │        65 │         .error_handler(f!(crate::error_handler));
-  │        66 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── The constructor was registered here
-  │        67 │     bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+  │           ╭─[borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/src/lib.rs:59:1]
+  │        59 │         .error_handler(f!(crate::error_handler));
+  │        60 │     bp.request_scoped(f!(crate::b));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── The constructor was registered here
+  │        61 │     bp.request_scoped(f!(crate::c));
   │           ╰────
   │   help: Considering changing the signature of the components that consume
   │         `app::B` by value.
   │         Would a shared reference, `&app::B`, be enough?
   │        ☞
-  │           ╭─[borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/src/lib.rs:67:1]
-  │        67 │     bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
-  │        68 │     bp.route(GET, "/home", f!(crate::handler));
+  │           ╭─[borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/src/lib.rs:61:1]
+  │        61 │     bp.request_scoped(f!(crate::c));
+  │        62 │     bp.route(GET, "/home", f!(crate::handler));
   │           ·                            ─────────┬────────
   │           ·                   One of the consuming request handlers
-  │        69 │     bp
+  │        63 │     bp
   │           ╰────
   │        ☞
-  │           ╭─[borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/src/lib.rs:66:1]
-  │        66 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-  │        67 │     bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── One of the consuming constructors
-  │        68 │     bp.route(GET, "/home", f!(crate::handler));
+  │           ╭─[borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/src/lib.rs:60:1]
+  │        60 │     bp.request_scoped(f!(crate::b));
+  │        61 │     bp.request_scoped(f!(crate::c));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── One of the consuming constructors
+  │        62 │     bp.route(GET, "/home", f!(crate::handler));
   │           ╰────
   │   help: If `app::B` itself cannot implement `Clone`, consider
   │         wrapping it in an `std::sync::Rc` or `std::sync::Arc`.
\ No newline at end of file
diff --git a/libs/ui_tests/borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/src/lib.rs b/libs/ui_tests/borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/src/lib.rs
index 4259c83f9..6ecc73c1c 100644
--- a/libs/ui_tests/borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/control_flow/multiple_consumers_pass_takes_control_flow_into_account_for_errors/src/lib.rs
@@ -1,11 +1,5 @@
-use std::path::PathBuf;
-
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
 use pavex::response::Response;
 
 // The call graph looks like this:
@@ -61,10 +55,10 @@ pub fn handler(_b: B, _c: C) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped)
+    bp.request_scoped(f!(crate::a))
         .error_handler(f!(crate::error_handler));
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::b));
+    bp.request_scoped(f!(crate::c));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/control_flow/you_can_consume_a_non_cloneable_type_from_two_different_control_flow_branches/src/lib.rs b/libs/ui_tests/borrow_checker/control_flow/you_can_consume_a_non_cloneable_type_from_two_different_control_flow_branches/src/lib.rs
index 7612f4db5..0cdd0f923 100644
--- a/libs/ui_tests/borrow_checker/control_flow/you_can_consume_a_non_cloneable_type_from_two_different_control_flow_branches/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/control_flow/you_can_consume_a_non_cloneable_type_from_two_different_control_flow_branches/src/lib.rs
@@ -1,11 +1,5 @@
-use std::path::PathBuf;
-
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
 use pavex::response::Response;
 
 // The call graph looks like this:
@@ -48,9 +42,9 @@ pub fn handler(_a: A, _b: B) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped)
+    bp.request_scoped(f!(crate::a))
         .error_handler(f!(crate::error_handler));
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::b));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/diamond/diamond_can_be_solved_if_type_is_copy/src/lib.rs b/libs/ui_tests/borrow_checker/diamond/diamond_can_be_solved_if_type_is_copy/src/lib.rs
index 583efe420..f97e41bcf 100644
--- a/libs/ui_tests/borrow_checker/diamond/diamond_can_be_solved_if_type_is_copy/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/diamond/diamond_can_be_solved_if_type_is_copy/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -56,12 +50,10 @@ pub fn handler(_c: C, _d: D) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped)
-        .clone_if_necessary();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped)
-        .clone_if_necessary();
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::d), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a)).clone_if_necessary();
+    bp.request_scoped(f!(crate::b)).clone_if_necessary();
+    bp.request_scoped(f!(crate::c));
+    bp.request_scoped(f!(crate::d));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/diamond/diamond_can_be_solved_if_we_can_clone/src/lib.rs b/libs/ui_tests/borrow_checker/diamond/diamond_can_be_solved_if_we_can_clone/src/lib.rs
index fb3482b55..b1b35dc58 100644
--- a/libs/ui_tests/borrow_checker/diamond/diamond_can_be_solved_if_we_can_clone/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/diamond/diamond_can_be_solved_if_we_can_clone/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -56,12 +50,10 @@ pub fn handler(_c: C, _d: D) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped)
-        .clone_if_necessary();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped)
-        .clone_if_necessary();
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::d), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a)).clone_if_necessary();
+    bp.request_scoped(f!(crate::b)).clone_if_necessary();
+    bp.request_scoped(f!(crate::c));
+    bp.request_scoped(f!(crate::d));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/expectations/stderr.txt b/libs/ui_tests/borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/expectations/stderr.txt
index d25f79bae..cd4fd97b0 100644
--- a/libs/ui_tests/borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/expectations/stderr.txt
+++ b/libs/ui_tests/borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/expectations/stderr.txt
@@ -10,12 +10,12 @@
   │         You can do so by invoking `.cloning(CloningStrategy::CloneIfNecessary)`
   │         on the type returned by `.constructor`.
   │        ☞
-  │           ╭─[borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/src/lib.rs:51:1]
-  │        51 │     let mut bp = Blueprint::new();
-  │        52 │     bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── The constructor was registered here
-  │        53 │     // Being a singleton, this will be an input type of the dependency closure for the request handler
+  │           ╭─[borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/src/lib.rs:49:1]
+  │        49 │     let mut bp = Blueprint::new();
+  │        50 │     bp.request_scoped(f!(crate::a));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── The constructor was registered here
+  │        51 │     // Being a singleton, this will be an input type of the dependency closure for the request handler
   │           ╰────
   │   help: Considering changing the signature of `app::a`.
   │         It takes `app::A` by value. Would a shared reference,
@@ -35,12 +35,12 @@
   │         You can do so by invoking `.cloning(CloningStrategy::CloneIfNecessary)`
   │         on the type returned by `.constructor`.
   │        ☞
-  │           ╭─[borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/src/lib.rs:53:1]
-  │        53 │     // Being a singleton, this will be an input type of the dependency closure for the request handler
-  │        54 │     bp.constructor(f!(crate::b), Lifecycle::Singleton);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── The constructor was registered here
-  │        55 │     bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+  │           ╭─[borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/src/lib.rs:51:1]
+  │        51 │     // Being a singleton, this will be an input type of the dependency closure for the request handler
+  │        52 │     bp.singleton(f!(crate::b));
+  │           ·                  ──────┬─────
+  │           ·                        ╰── The constructor was registered here
+  │        53 │     bp.request_scoped(f!(crate::c));
   │           ╰────
   │   help: Considering changing the signature of `app::b`.
   │         It takes `app::B` by value. Would a shared reference,
diff --git a/libs/ui_tests/borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/src/lib.rs b/libs/ui_tests/borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/src/lib.rs
index 3f77a200a..a4250f141 100644
--- a/libs/ui_tests/borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/diamond/diamond_cannot_be_solved_if_we_cannot_clone/src/lib.rs
@@ -1,6 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{constructor::Lifecycle, router::GET, Blueprint};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -49,11 +47,11 @@ pub fn handler(_c: C, _d: D) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a));
     // Being a singleton, this will be an input type of the dependency closure for the request handler
-    bp.constructor(f!(crate::b), Lifecycle::Singleton);
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::d), Lifecycle::RequestScoped);
+    bp.singleton(f!(crate::b));
+    bp.request_scoped(f!(crate::c));
+    bp.request_scoped(f!(crate::d));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_framework_type_can_be_moved_twice/src/lib.rs b/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_framework_type_can_be_moved_twice/src/lib.rs
index ed11b8979..4a4bb8dcd 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_framework_type_can_be_moved_twice/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_framework_type_can_be_moved_twice/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::request::path::RawPathParams;
 use pavex::response::Response;
@@ -39,8 +33,8 @@ pub fn handler(_b: B, _c: C) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::b));
+    bp.request_scoped(f!(crate::c));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_input_type_can_be_moved_twice/src/lib.rs b/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_input_type_can_be_moved_twice/src/lib.rs
index 5c7f7afe1..c14625c82 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_input_type_can_be_moved_twice/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_input_type_can_be_moved_twice/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -45,10 +39,9 @@ pub fn handler(_b: B, _c: C) -> Response {
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
     // A is a singleton, so it will be an input parameter of the dependency closure for `handler`
-    bp.constructor(f!(crate::a), Lifecycle::Singleton)
-        .clone_if_necessary();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+    bp.singleton(f!(crate::a)).clone_if_necessary();
+    bp.request_scoped(f!(crate::b));
+    bp.request_scoped(f!(crate::c));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_type_can_be_moved_twice/src/lib.rs b/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_type_can_be_moved_twice/src/lib.rs
index e7eab6418..f7c497979 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_type_can_be_moved_twice/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_clonable_type_can_be_moved_twice/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -44,10 +38,9 @@ pub fn handler(_b: B, _c: C) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped)
-        .clone_if_necessary();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a)).clone_if_necessary();
+    bp.request_scoped(f!(crate::b));
+    bp.request_scoped(f!(crate::c));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_copy_type_can_be_moved_twice/src/lib.rs b/libs/ui_tests/borrow_checker/multiple_consumers/a_copy_type_can_be_moved_twice/src/lib.rs
index 057bcc3fa..4fdbeaf5a 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_copy_type_can_be_moved_twice/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_copy_type_can_be_moved_twice/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -44,10 +38,9 @@ pub fn handler(_b: B, _c: C) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped)
-        .clone_if_necessary();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a)).clone_if_necessary();
+    bp.request_scoped(f!(crate::b));
+    bp.request_scoped(f!(crate::c));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/expectations/stderr.txt b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/expectations/stderr.txt
index a851f4aa7..b7d1ab7da 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/expectations/stderr.txt
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/expectations/stderr.txt
@@ -13,18 +13,18 @@
   │         `pavex::request::RequestHead` by value.
   │         Would a shared reference, `&pavex::request::RequestHead`, be enough?
   │        ☞
-  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/src/lib.rs:39:1]
-  │        39 │     let mut bp = Blueprint::new();
-  │        40 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── One of the consuming constructors
-  │        41 │     bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/src/lib.rs:35:1]
+  │        35 │     let mut bp = Blueprint::new();
+  │        36 │     bp.request_scoped(f!(crate::b));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── One of the consuming constructors
+  │        37 │     bp.request_scoped(f!(crate::c));
   │           ╰────
   │        ☞
-  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/src/lib.rs:40:1]
-  │        40 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-  │        41 │     bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── One of the consuming constructors
-  │        42 │     bp.route(GET, "/home", f!(crate::handler));
+  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/src/lib.rs:36:1]
+  │        36 │     bp.request_scoped(f!(crate::b));
+  │        37 │     bp.request_scoped(f!(crate::c));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── One of the consuming constructors
+  │        38 │     bp.route(GET, "/home", f!(crate::handler));
   │           ╰────
\ No newline at end of file
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/src/lib.rs b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/src/lib.rs
index 16f3c733a..f9c6246ba 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_framework_type_cannot_be_moved_twice/src/lib.rs
@@ -1,8 +1,4 @@
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::request::RequestHead;
 use pavex::response::Response;
@@ -37,8 +33,8 @@ pub fn handler(_b: B, _c: C) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::b));
+    bp.request_scoped(f!(crate::c));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/expectations/stderr.txt b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/expectations/stderr.txt
index d4030acc5..64b909b8d 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/expectations/stderr.txt
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/expectations/stderr.txt
@@ -14,29 +14,29 @@
   │         You can do so by invoking `.cloning(CloningStrategy::CloneIfNecessary)`
   │         on the type returned by `.constructor`.
   │        ☞
-  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/src/lib.rs:43:1]
-  │        43 │     // `A` is a singleton, therefore it will be an input of the dependency closure for the handler
-  │        44 │     bp.constructor(f!(crate::a), Lifecycle::Singleton);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── The constructor was registered here
-  │        45 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/src/lib.rs:41:1]
+  │        41 │     // `A` is a singleton, therefore it will be an input of the dependency closure for the handler
+  │        42 │     bp.singleton(f!(crate::a));
+  │           ·                  ──────┬─────
+  │           ·                        ╰── The constructor was registered here
+  │        43 │     bp.request_scoped(f!(crate::b));
   │           ╰────
   │   help: Considering changing the signature of the components that consume
   │         `app::A` by value.
   │         Would a shared reference, `&app::A`, be enough?
   │        ☞
-  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/src/lib.rs:44:1]
-  │        44 │     bp.constructor(f!(crate::a), Lifecycle::Singleton);
-  │        45 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── One of the consuming constructors
-  │        46 │     bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/src/lib.rs:42:1]
+  │        42 │     bp.singleton(f!(crate::a));
+  │        43 │     bp.request_scoped(f!(crate::b));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── One of the consuming constructors
+  │        44 │     bp.request_scoped(f!(crate::c));
   │           ╰────
   │        ☞
-  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/src/lib.rs:45:1]
-  │        45 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-  │        46 │     bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── One of the consuming constructors
-  │        47 │     bp.route(GET, "/home", f!(crate::handler));
+  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/src/lib.rs:43:1]
+  │        43 │     bp.request_scoped(f!(crate::b));
+  │        44 │     bp.request_scoped(f!(crate::c));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── One of the consuming constructors
+  │        45 │     bp.route(GET, "/home", f!(crate::handler));
   │           ╰────
\ No newline at end of file
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/src/lib.rs b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/src/lib.rs
index 206e26215..a23fe67ad 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_input_type_cannot_be_moved_twice/src/lib.rs
@@ -1,6 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{constructor::Lifecycle, router::GET, Blueprint};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -41,9 +39,9 @@ pub fn handler(_b: B, _c: C) -> Response {
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
     // `A` is a singleton, therefore it will be an input of the dependency closure for the handler
-    bp.constructor(f!(crate::a), Lifecycle::Singleton);
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+    bp.singleton(f!(crate::a));
+    bp.request_scoped(f!(crate::b));
+    bp.request_scoped(f!(crate::c));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/expectations/stderr.txt b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/expectations/stderr.txt
index a9eae62a4..845c9d042 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/expectations/stderr.txt
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/expectations/stderr.txt
@@ -14,31 +14,31 @@
   │         You can do so by invoking `.cloning(CloningStrategy::CloneIfNecessary)`
   │         on the type returned by `.constructor`.
   │        ☞
-  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/src/lib.rs:41:1]
-  │        41 │     let mut bp = Blueprint::new();
-  │        42 │     bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── The constructor was registered here
-  │        43 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/src/lib.rs:39:1]
+  │        39 │     let mut bp = Blueprint::new();
+  │        40 │     bp.request_scoped(f!(crate::a));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── The constructor was registered here
+  │        41 │     bp.request_scoped(f!(crate::b));
   │           ╰────
   │   help: Considering changing the signature of the components that consume
   │         `app::A` by value.
   │         Would a shared reference, `&app::A`, be enough?
   │        ☞
-  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/src/lib.rs:42:1]
-  │        42 │     bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-  │        43 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── One of the consuming constructors
-  │        44 │     bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/src/lib.rs:40:1]
+  │        40 │     bp.request_scoped(f!(crate::a));
+  │        41 │     bp.request_scoped(f!(crate::b));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── One of the consuming constructors
+  │        42 │     bp.request_scoped(f!(crate::c));
   │           ╰────
   │        ☞
-  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/src/lib.rs:43:1]
-  │        43 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-  │        44 │     bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── One of the consuming constructors
-  │        45 │     bp.route(GET, "/home", f!(crate::handler));
+  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/src/lib.rs:41:1]
+  │        41 │     bp.request_scoped(f!(crate::b));
+  │        42 │     bp.request_scoped(f!(crate::c));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── One of the consuming constructors
+  │        43 │     bp.route(GET, "/home", f!(crate::handler));
   │           ╰────
   │   help: If `app::A` itself cannot implement `Clone`, consider
   │         wrapping it in an `std::sync::Rc` or `std::sync::Arc`.
\ No newline at end of file
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/src/lib.rs b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/src/lib.rs
index 75bdb197c..9ee48c581 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice/src/lib.rs
@@ -1,6 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{constructor::Lifecycle, router::GET, Blueprint};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -39,9 +37,9 @@ pub fn handler(_b: B, _c: C) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a));
+    bp.request_scoped(f!(crate::b));
+    bp.request_scoped(f!(crate::c));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/expectations/stderr.txt b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/expectations/stderr.txt
index 9a34f8c86..284e606d7 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/expectations/stderr.txt
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/expectations/stderr.txt
@@ -14,23 +14,23 @@
   │         You can do so by invoking `.cloning(CloningStrategy::CloneIfNecessary)`
   │         on the type returned by `.constructor`.
   │        ☞
-  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/src/lib.rs:29:1]
-  │        29 │     let mut bp = Blueprint::new();
-  │        30 │     bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── The constructor was registered here
-  │        31 │     bp.wrap(f!(crate::mw));
+  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/src/lib.rs:23:1]
+  │        23 │     let mut bp = Blueprint::new();
+  │        24 │     bp.request_scoped(f!(crate::a));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── The constructor was registered here
+  │        25 │     bp.wrap(f!(crate::mw));
   │           ╰────
   │   help: Considering changing the signature of the components that consume
   │         `app::A` by value.
   │         Would a shared reference, `&app::A`, be enough?
   │        ☞
-  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/src/lib.rs:30:1]
-  │        30 │     bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-  │        31 │     bp.wrap(f!(crate::mw));
+  │           ╭─[borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/src/lib.rs:24:1]
+  │        24 │     bp.request_scoped(f!(crate::a));
+  │        25 │     bp.wrap(f!(crate::mw));
   │           ·             ──────┬──────
   │           ·                   ╰── One of the consuming wrapping middlewares
-  │        32 │     bp.route(GET, "/home", f!(crate::handler));
+  │        26 │     bp.route(GET, "/home", f!(crate::handler));
   │           ╰────
   │   help: If `app::A` itself cannot implement `Clone`, consider
   │         wrapping it in an `std::sync::Rc` or `std::sync::Arc`.
\ No newline at end of file
diff --git a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/src/lib.rs b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/src/lib.rs
index e65831652..2794018b1 100644
--- a/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/multiple_consumers/a_non_clonable_type_cannot_be_moved_twice_across_stages/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::middleware::Next;
 use pavex::response::Response;
@@ -27,7 +21,7 @@ where
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a));
     bp.wrap(f!(crate::mw));
     bp.route(GET, "/home", f!(crate::handler));
     bp
diff --git a/libs/ui_tests/borrow_checker/mutability/src/lib.rs b/libs/ui_tests/borrow_checker/mutability/src/lib.rs
index c3036525c..c7f5ae90d 100644
--- a/libs/ui_tests/borrow_checker/mutability/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/mutability/src/lib.rs
@@ -1,6 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{constructor::Lifecycle, router::GET, Blueprint};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -41,8 +39,8 @@ pub fn handler(_a: &mut A, _b: B) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a));
+    bp.request_scoped(f!(crate::b));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/transitive_borrows/expectations/stderr.txt b/libs/ui_tests/borrow_checker/transitive_borrows/expectations/stderr.txt
index 8a70942eb..12661dbab 100644
--- a/libs/ui_tests/borrow_checker/transitive_borrows/expectations/stderr.txt
+++ b/libs/ui_tests/borrow_checker/transitive_borrows/expectations/stderr.txt
@@ -13,12 +13,12 @@
   │         You can do so by invoking `.clone_if_necessary()` after having
   │         registered your constructor.
   │        ☞
-  │           ╭─[borrow_checker/transitive_borrows/src/lib.rs:47:1]
-  │        47 │     let mut bp = Blueprint::new();
-  │        48 │     bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── The constructor was registered here
-  │        49 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+  │           ╭─[borrow_checker/transitive_borrows/src/lib.rs:45:1]
+  │        45 │     let mut bp = Blueprint::new();
+  │        46 │     bp.request_scoped(f!(crate::a));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── The constructor was registered here
+  │        47 │     bp.request_scoped(f!(crate::b));
   │           ╰────
   │   help: Consider changing the signature of `app::b`.
   │         It takes `app::A` by value. Would a shared reference,
diff --git a/libs/ui_tests/borrow_checker/transitive_borrows/src/lib.rs b/libs/ui_tests/borrow_checker/transitive_borrows/src/lib.rs
index 50b45dd19..7e4427575 100644
--- a/libs/ui_tests/borrow_checker/transitive_borrows/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/transitive_borrows/src/lib.rs
@@ -1,6 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{constructor::Lifecycle, router::GET, Blueprint};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -45,9 +43,9 @@ pub fn handler(_c: C, _b: B) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::c), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a));
+    bp.request_scoped(f!(crate::b));
+    bp.request_scoped(f!(crate::c));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_framework_type_is_clonable/src/lib.rs b/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_framework_type_is_clonable/src/lib.rs
index 599cd24bd..ee8d0a254 100644
--- a/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_framework_type_is_clonable/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_framework_type_is_clonable/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::request::path::RawPathParams;
 use pavex::response::Response;
@@ -34,7 +28,7 @@ pub fn handler(_p: &RawPathParams, _b: B) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::b));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_input_type_is_clonable/src/lib.rs b/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_input_type_is_clonable/src/lib.rs
index 6d6cdd7be..346b57ec3 100644
--- a/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_input_type_is_clonable/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_input_type_is_clonable/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -40,9 +34,8 @@ pub fn handler(_a: &A, _b: B) -> Response {
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
     // A is a singleton, so it will be an input parameter of the dependency closure for `handler`
-    bp.constructor(f!(crate::a), Lifecycle::Singleton)
-        .clone_if_necessary();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+    bp.singleton(f!(crate::a)).clone_if_necessary();
+    bp.request_scoped(f!(crate::b));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_type_is_clonable/src/lib.rs b/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_type_is_clonable/src/lib.rs
index b9c82d567..932e636d5 100644
--- a/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_type_is_clonable/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_type_is_clonable/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -39,9 +33,8 @@ pub fn handler(_a: &A, _b: B) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped)
-        .clone_if_necessary();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a)).clone_if_necessary();
+    bp.request_scoped(f!(crate::b));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_type_is_copy/src/lib.rs b/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_type_is_copy/src/lib.rs
index 797c37797..29de2b0f0 100644
--- a/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_type_is_copy/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/triangle/triangle_can_be_solved_if_type_is_copy/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -39,9 +33,8 @@ pub fn handler(_a: &A, _b: B) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped)
-        .clone_if_necessary();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a)).clone_if_necessary();
+    bp.request_scoped(f!(crate::b));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_framework_type_is_not_clonable/src/lib.rs b/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_framework_type_is_not_clonable/src/lib.rs
index 92d059d9a..db9e8f095 100644
--- a/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_framework_type_is_not_clonable/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_framework_type_is_not_clonable/src/lib.rs
@@ -1,4 +1,4 @@
-use pavex::blueprint::{constructor::Lifecycle, router::GET, Blueprint};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::request::RequestHead;
 use pavex::response::Response;
@@ -27,7 +27,7 @@ pub fn handler(_r: &RequestHead, _b: B) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::b));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_input_type_is_not_clonable/expectations/stderr.txt b/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_input_type_is_not_clonable/expectations/stderr.txt
index 322875321..f406a228e 100644
--- a/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_input_type_is_not_clonable/expectations/stderr.txt
+++ b/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_input_type_is_not_clonable/expectations/stderr.txt
@@ -12,12 +12,12 @@
   │         You can do so by invoking `.clone_if_necessary()` after having
   │         registered your constructor.
   │        ☞
-  │           ╭─[borrow_checker/triangle/triangle_cannot_be_solved_if_input_type_is_not_clonable/src/lib.rs:37:1]
-  │        37 │     // A is a singleton, so it will be an input parameter of the dependency closure for `handler`
-  │        38 │     bp.constructor(f!(crate::a), Lifecycle::Singleton);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── The constructor was registered here
-  │        39 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+  │           ╭─[borrow_checker/triangle/triangle_cannot_be_solved_if_input_type_is_not_clonable/src/lib.rs:35:1]
+  │        35 │     // A is a singleton, so it will be an input parameter of the dependency closure for `handler`
+  │        36 │     bp.singleton(f!(crate::a));
+  │           ·                  ──────┬─────
+  │           ·                        ╰── The constructor was registered here
+  │        37 │     bp.request_scoped(f!(crate::b));
   │           ╰────
   │   help: Consider changing the signature of `app::b`.
   │         It takes `app::A` by value. Would a shared reference,
diff --git a/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_input_type_is_not_clonable/src/lib.rs b/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_input_type_is_not_clonable/src/lib.rs
index 53e4e14bf..7cb083600 100644
--- a/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_input_type_is_not_clonable/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_input_type_is_not_clonable/src/lib.rs
@@ -1,6 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{constructor::Lifecycle, router::GET, Blueprint};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -35,8 +33,8 @@ pub fn handler(_a: &A, _b: B) -> Response {
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
     // A is a singleton, so it will be an input parameter of the dependency closure for `handler`
-    bp.constructor(f!(crate::a), Lifecycle::Singleton);
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+    bp.singleton(f!(crate::a));
+    bp.request_scoped(f!(crate::b));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_type_is_not_clonable/expectations/stderr.txt b/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_type_is_not_clonable/expectations/stderr.txt
index 3065ee2ca..6e71dbe89 100644
--- a/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_type_is_not_clonable/expectations/stderr.txt
+++ b/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_type_is_not_clonable/expectations/stderr.txt
@@ -12,12 +12,12 @@
   │         You can do so by invoking `.clone_if_necessary()` after having
   │         registered your constructor.
   │        ☞
-  │           ╭─[borrow_checker/triangle/triangle_cannot_be_solved_if_type_is_not_clonable/src/lib.rs:36:1]
-  │        36 │     let mut bp = Blueprint::new();
-  │        37 │     bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-  │           ·                    ──────┬─────
-  │           ·                          ╰── The constructor was registered here
-  │        38 │     bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+  │           ╭─[borrow_checker/triangle/triangle_cannot_be_solved_if_type_is_not_clonable/src/lib.rs:34:1]
+  │        34 │     let mut bp = Blueprint::new();
+  │        35 │     bp.request_scoped(f!(crate::a));
+  │           ·                       ──────┬─────
+  │           ·                             ╰── The constructor was registered here
+  │        36 │     bp.request_scoped(f!(crate::b));
   │           ╰────
   │   help: Consider changing the signature of `app::b`.
   │         It takes `app::A` by value. Would a shared reference,
diff --git a/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_type_is_not_clonable/src/lib.rs b/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_type_is_not_clonable/src/lib.rs
index 704b5e17c..e11ea7437 100644
--- a/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_type_is_not_clonable/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/triangle/triangle_cannot_be_solved_if_type_is_not_clonable/src/lib.rs
@@ -1,6 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{constructor::Lifecycle, router::GET, Blueprint};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::response::Response;
 
@@ -34,8 +32,8 @@ pub fn handler(_a: &A, _b: B) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped);
-    bp.constructor(f!(crate::b), Lifecycle::RequestScoped);
+    bp.request_scoped(f!(crate::a));
+    bp.request_scoped(f!(crate::b));
     bp.route(GET, "/home", f!(crate::handler));
     bp
 }
diff --git a/libs/ui_tests/borrow_checker/triangle/triangle_with_middleware_can_be_solved_if_type_is_clonable/src/lib.rs b/libs/ui_tests/borrow_checker/triangle/triangle_with_middleware_can_be_solved_if_type_is_clonable/src/lib.rs
index 439fb7b6e..379ac2cde 100644
--- a/libs/ui_tests/borrow_checker/triangle/triangle_with_middleware_can_be_solved_if_type_is_clonable/src/lib.rs
+++ b/libs/ui_tests/borrow_checker/triangle/triangle_with_middleware_can_be_solved_if_type_is_clonable/src/lib.rs
@@ -1,10 +1,4 @@
-use std::path::PathBuf;
-
-use pavex::blueprint::{
-    constructor::{CloningStrategy, Lifecycle},
-    router::GET,
-    Blueprint,
-};
+use pavex::blueprint::{router::GET, Blueprint};
 use pavex::f;
 use pavex::middleware::Next;
 use pavex::response::Response;
@@ -41,8 +35,7 @@ pub fn handler(_a: &A) -> Response {
 
 pub fn blueprint() -> Blueprint {
     let mut bp = Blueprint::new();
-    bp.constructor(f!(crate::a), Lifecycle::RequestScoped)
-        .clone_if_necessary();
+    bp.request_scoped(f!(crate::a)).clone_if_necessary();
     bp.wrap(f!(crate::mw));
     bp.route(GET, "/home", f!(crate::handler));
     bp