Clean up reset patterns in field.info.inc

+++ b/modules/field/field.info.inc
@@ -29,20 +29,14 @@ function field_info_cache_clear() {
- *   If $reset is FALSE, an array containing the following elements:

@@ -157,15 +150,18 @@ function _field_info_collate_types($reset = FALSE) {
- *   If $reset is FALSE, an array containing the following elements:

Let's keep "An associative array containing:"

+++ b/modules/field/field.info.inc
@@ -65,21 +59,20 @@ function field_info_cache_clear() {
+function _field_info_collate_types() {
...
-  static $info;
...
+  static $drupal_static_fast;

@@ -176,14 +172,14 @@ function _field_info_collate_types($reset = FALSE) {
-  static $info;
+function _field_info_collate_fields() {
...
+  static $drupal_static_fast;

How often is this really called? I'm not sure whether the fast pattern is justified here.

-1 days to next Drupal core point release.

I like this $reset clean-up patch. I have not tested it, but reviewing the latest patch, it looks good to go.

Hm. The correlation between the collator and the reset function isn't obvious unless you already know that both exist. We should prevent people from simply using drupal_static_reset().

Let's add @see respective lines to the end of the phpDocs of both functions.

the @see mentions need () after the function names.
Other than that, fine by me.

This will probably get refactored with #1040790: _field_info_collate_fields() memory usage (when I can get back to it...), but meanwhile, sounds good.

Hm, wait a sec.
_field_info_collate_types() and (mostly) _field_info_collate_fields() can be called quite a bit during a request.

Moving the statics in there over to drupal_static() should have happened long ago (I think there were two concurrent patches somewhere in the queue, that just neutralized each other...), but I'd rather have them use the $drupal_static_fast pattern (as was done in the original patch above).

Straight re-upload for the bot

Thanks !

Looks like good cleanup, committed and pushed!