Skip to content

build_limits: Default::default for defaults, rename new to from_config #3511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
syphar merged 1 commit into from
Sep 10, 2026
Merged

build_limits: Default::default for defaults, rename new to from_config #3511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/bin/docs_rs_web/src/handlers/about.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub(crate) async fn about_builds_handler(
) -> AxumResult<impl IntoResponse> {
Ok(AboutBuilds {
rustc_version: get_config::<String>(&mut conn, ConfigName::RustcVersion).await?,
limits: Limits::new(context.config().build_limits()?),
limits: Limits::from_config(context.config().build_limits()?),
active_tab: "builds",
})
}
Expand Down
24 changes: 18 additions & 6 deletions crates/lib/docs_rs_build_limits/src/limits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,36 @@ pub struct Limits {
pub max_log_size: usize,
}

impl Limits {
pub fn new(config: &Config) -> Self {
impl Default for Limits {
fn default() -> Self {
Comment thread
syphar marked this conversation as resolved.
Self {
// 3 GB default default
memory: config.build_default_memory_limit.unwrap_or(3 * GB),
memory: 3 * GB,
timeout: Duration::from_secs(15 * 60), // 15 minutes
targets: crate::DEFAULT_MAX_TARGETS,
networking: false,
max_log_size: 100 * 1024, // 100 KB
}
}
}

impl Limits {
pub fn from_config(config: &Config) -> Self {
let mut limits = Limits::default();

if let Some(memory_limit) = config.build_default_memory_limit {
limits.memory = memory_limit;
}

limits
}

pub async fn for_crate(
config: &Config,
conn: &mut sqlx::PgConnection,
name: &KrateName,
) -> Result<Self> {
let default = Self::new(config);
let default = Self::from_config(config);
let overrides = Overrides::for_crate(conn, name).await?.unwrap_or_default();
Ok(Self {
memory: overrides
Expand Down Expand Up @@ -94,7 +106,7 @@ mod test {

let cfg = Config::default();

let defaults = Limits::new(&cfg);
let defaults = Limits::from_config(&cfg);

let krate = KrateName::from_static("hexponent");
// limits work if no crate has limits set
Expand Down Expand Up @@ -186,7 +198,7 @@ mod test {

let cfg = Config::default();

let defaults = Limits::new(&cfg);
let defaults = Limits::from_config(&cfg);

Overrides::save(
&mut conn,
Expand Down
5 changes: 5 additions & 0 deletions mise.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading