Skip to content

Commit 81a5c5e

Browse files
committed
Remove taintedness/trustedness enums/macros deprecated for 4 years
1 parent b2406b6 commit 81a5c5e

3 files changed

Lines changed: 1 addition & 158 deletions

File tree

include/ruby/internal/fl_type.h

Lines changed: 0 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
#define FL_WB_PROTECTED RBIMPL_CAST((VALUE)RUBY_FL_WB_PROTECTED) /**< @old{RUBY_FL_WB_PROTECTED} */
6060
#define FL_PROMOTED RBIMPL_CAST((VALUE)RUBY_FL_PROMOTED) /**< @old{RUBY_FL_PROMOTED} */
6161
#define FL_FINALIZE RBIMPL_CAST((VALUE)RUBY_FL_FINALIZE) /**< @old{RUBY_FL_FINALIZE} */
62-
#define FL_TAINT RBIMPL_CAST((VALUE)RUBY_FL_TAINT) /**< @old{RUBY_FL_TAINT} */
6362
#define FL_SHAREABLE RBIMPL_CAST((VALUE)RUBY_FL_SHAREABLE) /**< @old{RUBY_FL_SHAREABLE} */
6463
#define FL_UNTRUSTED RBIMPL_CAST((VALUE)RUBY_FL_UNTRUSTED) /**< @old{RUBY_FL_UNTRUSTED} */
6564
#define FL_EXIVAR RBIMPL_CAST((VALUE)RUBY_FL_EXIVAR) /**< @old{RUBY_FL_EXIVAR} */
@@ -237,21 +236,6 @@ ruby_fl_type {
237236
*/
238237
RUBY_FL_FINALIZE = (1<<7),
239238

240-
/**
241-
* @deprecated This flag once was a thing back in the old days, but makes
242-
* no sense any longer today. Exists here for backwards
243-
* compatibility only. You can safely forget about it.
244-
*/
245-
RUBY_FL_TAINT
246-
247-
#if defined(RBIMPL_HAVE_ENUM_ATTRIBUTE)
248-
RBIMPL_ATTR_DEPRECATED(("taintedness turned out to be a wrong idea."))
249-
#elif defined(_MSC_VER)
250-
# pragma deprecated(RUBY_FL_TAINT)
251-
#endif
252-
253-
= 0,
254-
255239
/**
256240
* @deprecated This flag was an implementation detail that should never have
257241
* no been exposed. Exists here for backwards
@@ -279,21 +263,6 @@ ruby_fl_type {
279263
*/
280264
RUBY_FL_SHAREABLE = (1<<8),
281265

282-
/**
283-
* @deprecated This flag once was a thing back in the old days, but makes
284-
* no sense any longer today. Exists here for backwards
285-
* compatibility only. You can safely forget about it.
286-
*/
287-
RUBY_FL_UNTRUSTED
288-
289-
#if defined(RBIMPL_HAVE_ENUM_ATTRIBUTE)
290-
RBIMPL_ATTR_DEPRECATED(("trustedness turned out to be a wrong idea."))
291-
#elif defined(_MSC_VER)
292-
# pragma deprecated(RUBY_FL_UNTRUSTED)
293-
#endif
294-
295-
= 0,
296-
297266
/**
298267
* This object weakly refers to other objects.
299268
*
@@ -735,128 +704,6 @@ RB_FL_REVERSE(VALUE obj, VALUE flags)
735704
}
736705
}
737706

738-
RBIMPL_ATTR_PURE_UNLESS_DEBUG()
739-
RBIMPL_ATTR_ARTIFICIAL()
740-
RBIMPL_ATTR_DEPRECATED(("taintedness turned out to be a wrong idea."))
741-
/**
742-
* @deprecated This function once was a thing in the old days, but makes no
743-
* sense any longer today. Exists here for backwards
744-
* compatibility only. You can safely forget about it.
745-
*
746-
* @param[in] obj Object in question.
747-
* @return false always.
748-
*/
749-
static inline bool
750-
RB_OBJ_TAINTABLE(VALUE obj)
751-
{
752-
(void)obj;
753-
return false;
754-
}
755-
756-
RBIMPL_ATTR_PURE_UNLESS_DEBUG()
757-
RBIMPL_ATTR_ARTIFICIAL()
758-
RBIMPL_ATTR_DEPRECATED(("taintedness turned out to be a wrong idea."))
759-
/**
760-
* @deprecated This function once was a thing in the old days, but makes no
761-
* sense any longer today. Exists here for backwards
762-
* compatibility only. You can safely forget about it.
763-
*
764-
* @param[in] obj Object in question.
765-
* @return false always.
766-
*/
767-
static inline VALUE
768-
RB_OBJ_TAINTED_RAW(VALUE obj)
769-
{
770-
(void)obj;
771-
return false;
772-
}
773-
774-
RBIMPL_ATTR_PURE_UNLESS_DEBUG()
775-
RBIMPL_ATTR_ARTIFICIAL()
776-
RBIMPL_ATTR_DEPRECATED(("taintedness turned out to be a wrong idea."))
777-
/**
778-
* @deprecated This function once was a thing in the old days, but makes no
779-
* sense any longer today. Exists here for backwards
780-
* compatibility only. You can safely forget about it.
781-
*
782-
* @param[in] obj Object in question.
783-
* @return false always.
784-
*/
785-
static inline bool
786-
RB_OBJ_TAINTED(VALUE obj)
787-
{
788-
(void)obj;
789-
return false;
790-
}
791-
792-
RBIMPL_ATTR_ARTIFICIAL()
793-
RBIMPL_ATTR_DEPRECATED(("taintedness turned out to be a wrong idea."))
794-
/**
795-
* @deprecated This function once was a thing in the old days, but makes no
796-
* sense any longer today. Exists here for backwards
797-
* compatibility only. You can safely forget about it.
798-
*
799-
* @param[in] obj Object in question.
800-
*/
801-
static inline void
802-
RB_OBJ_TAINT_RAW(VALUE obj)
803-
{
804-
(void)obj;
805-
return;
806-
}
807-
808-
RBIMPL_ATTR_ARTIFICIAL()
809-
RBIMPL_ATTR_DEPRECATED(("taintedness turned out to be a wrong idea."))
810-
/**
811-
* @deprecated This function once was a thing in the old days, but makes no
812-
* sense any longer today. Exists here for backwards
813-
* compatibility only. You can safely forget about it.
814-
*
815-
* @param[in] obj Object in question.
816-
*/
817-
static inline void
818-
RB_OBJ_TAINT(VALUE obj)
819-
{
820-
(void)obj;
821-
return;
822-
}
823-
824-
RBIMPL_ATTR_ARTIFICIAL()
825-
RBIMPL_ATTR_DEPRECATED(("taintedness turned out to be a wrong idea."))
826-
/**
827-
* @deprecated This function once was a thing in the old days, but makes no
828-
* sense any longer today. Exists here for backwards
829-
* compatibility only. You can safely forget about it.
830-
*
831-
* @param[in] dst Victim object.
832-
* @param[in] src Infectant object.
833-
*/
834-
static inline void
835-
RB_OBJ_INFECT_RAW(VALUE dst, VALUE src)
836-
{
837-
(void)dst;
838-
(void)src;
839-
return;
840-
}
841-
842-
RBIMPL_ATTR_ARTIFICIAL()
843-
RBIMPL_ATTR_DEPRECATED(("taintedness turned out to be a wrong idea."))
844-
/**
845-
* @deprecated This function once was a thing in the old days, but makes no
846-
* sense any longer today. Exists here for backwards
847-
* compatibility only. You can safely forget about it.
848-
*
849-
* @param[in] dst Victim object.
850-
* @param[in] src Infectant object.
851-
*/
852-
static inline void
853-
RB_OBJ_INFECT(VALUE dst, VALUE src)
854-
{
855-
(void)dst;
856-
(void)src;
857-
return;
858-
}
859-
860707
RBIMPL_ATTR_PURE_UNLESS_DEBUG()
861708
RBIMPL_ATTR_ARTIFICIAL()
862709
/**

yjit/src/cruby_bindings.inc.rs

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zjit/src/cruby_bindings.inc.rs

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)