Skip to content

Commit

Permalink
correct docs and code comments around the plrust.required_lints GUC (
Browse files Browse the repository at this point in the history
  • Loading branch information
eeeebbbbrrrr committed Jun 21, 2023
1 parent 9d74dba commit 7ce4318
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
13 changes: 8 additions & 5 deletions doc/src/config-lints.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@ these custom lints, PL/Rust uses some standard Rust lints to enforce safety.


The `plrust.required_lints` GUC defines which lints must have been applied to a function before PL/Rust will load the
library and execute the function. Using the `PLRUST_REQUIRED_LINTS` environment variable, it is possible to enforce
that certain lints are always required of compiled functions, regardless of the `plrust.required_lints` GUC value.
`PLRUST_REQUIRED_LINTS`'s format is a comma-separated list of lint named. It must be set in the environment in which
Postgres is started. The intention here is that the system administrator can force certain lints for execution if for
some reason `postgresql.conf` or the users able to modify it are not trusted.
library and execute the function. The default value is the empty set -- PL/Rust will not require any specific lints to
have been previously applied to a function.

Using the `PLRUST_REQUIRED_LINTS` environment variable, it is possible to enforce that certain lints are always required
of compiled functions, regardless of the `plrust.required_lints` GUC value.`PLRUST_REQUIRED_LINTS`'s format is a
comma-separated list of lint named. It must be set in the environment in which Postgres is started. The intention here
is that the system administrator can force certain lints for execution if for some reason `postgresql.conf` or the users
able to modify it are not trusted.


In all cases, these lints are added to the generated code which wraps the user's `LANGUAGE plrust` function, as
Expand Down
1 change: 0 additions & 1 deletion doc/src/config-pg.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,5 +164,4 @@ plrust.compile_lints = 'plrust_extern_blocks, plrust_lifetime_parameterized_trai

A comma-separated list of Rust lints that are required to have been applied to a user function before PL/Rust will load the library and execute the function.

The value of `plrust.required_lints` defaults to `plrust.compile_lints`.

2 changes: 1 addition & 1 deletion plrust/src/gucs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ pub(crate) fn init() {
GucRegistry::define_string_guc(
"plrust.required_lints",
"A comma-separated list of Rust code lints that are required to have been applied to a PL/Rust user function before PL/Rust will execute it",
"If unspecified, PL/Rust will use a set of defaults",
"If unspecified, the default is the empty set",
&PLRUST_REQUIRED_LINTS,
GucContext::Sighup,
GucFlags::default(),
Expand Down
20 changes: 9 additions & 11 deletions plrust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@ Use of this source code is governed by the PostgreSQL license that can be found
#[cfg(all(
feature = "trusted",
not(any(
all(
target_os = "linux",
any(target_arch = "x86_64", target_arch = "aarch64")
),
all(
target_os = "macos",
any(target_arch = "x86_64", target_arch = "aarch64")
)
all(
target_os = "linux",
any(target_arch = "x86_64", target_arch = "aarch64")
),
all(
target_os = "macos",
any(target_arch = "x86_64", target_arch = "aarch64")
)
)
))
))]
compile_error!("This platform does not support the 'trusted' version of plrust");

Expand Down Expand Up @@ -76,8 +75,7 @@ $$;
bootstrap
);

/// This is the default set of lints we apply to PL/Rust user functions, and require of PL/Rust user
/// functions before we'll load and execute them.
/// This is the default set of lints we apply to PL/Rust user functions during compilation.
///
/// The defaults **can** be changed with the `plrust.compile_lints` and `plrust.required_lints` GUCS
// Hello from the futurepast!
Expand Down

0 comments on commit 7ce4318

Please sign in to comment.