From e2d87c1bcc952d63f606ea646e3145eca43b21d2 Mon Sep 17 00:00:00 2001 From: Richie Date: Tue, 15 Feb 2022 19:35:11 -0800 Subject: [PATCH 1/2] tweak: expand definition of suggested collision naming convention --- docs/style-guide.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/style-guide.rst b/docs/style-guide.rst index 1bbe6cc74..9138162cc 100644 --- a/docs/style-guide.rst +++ b/docs/style-guide.rst @@ -1258,8 +1258,7 @@ Avoiding Naming Collisions * ``single_trailing_underscore_`` -This convention is suggested when the desired name collides with that of a -built-in or otherwise reserved name. +This convention is suggested when the desired name collides with that of an existing state variable, function, built-in or otherwise reserved name. .. _style_guide_natspec: From 635ca409f85e44f05070a12cd11d755075bef2eb Mon Sep 17 00:00:00 2001 From: Richie Date: Wed, 16 Feb 2022 12:06:33 -0800 Subject: [PATCH 2/2] fix: shorten line length per code review --- docs/style-guide.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/style-guide.rst b/docs/style-guide.rst index 9138162cc..6efebafce 100644 --- a/docs/style-guide.rst +++ b/docs/style-guide.rst @@ -1258,7 +1258,8 @@ Avoiding Naming Collisions * ``single_trailing_underscore_`` -This convention is suggested when the desired name collides with that of an existing state variable, function, built-in or otherwise reserved name. +This convention is suggested when the desired name collides with that of +an existing state variable, function, built-in or otherwise reserved name. .. _style_guide_natspec: