math.functions: fold math.trig into math.functions

diff --git a/basis/math/functions/functions.factor b/basis/math/functions/functions.factor
index 47238366f227aca4b45535f8c743e808b657b299..061c47c9cb7eb55d1d757ab1e76c3b363cabe7a9 100644 (file)
--- a/basis/math/functions/functions.factor
+++ b/basis/math/functions/functions.factor
@@ -366,6 +366,10 @@ M: real atan >float atan ; inline
 
 : acot ( x -- y ) recip atan ; inline
 
+: deg>rad ( x -- y ) pi * 180 / ; inline
+
+: rad>deg ( x -- y ) 180 * pi / ; inline
+
 GENERIC: truncate ( x -- y )
 
 M: real truncate dup 1 mod - ;

diff --git a/basis/math/trig/tags.txt b/basis/math/trig/tags.txt
deleted file mode 100644 (file)
index ede10ab..0000000
--- a/basis/math/trig/tags.txt
+++ /dev/null
@@ -1 +0,0 @@
-math

diff --git a/basis/math/trig/trig.factor b/basis/math/trig/trig.factor
deleted file mode 100644 (file)
index 549cf36..0000000
--- a/basis/math/trig/trig.factor
+++ /dev/null
@@ -1,7 +0,0 @@
-! Copyright (C) 2008 Eduardo Cavazos.
-! See https://factorcode.org/license.txt for BSD license.
-USING: math math.constants ;
-IN: math.trig
-
-: deg>rad ( x -- y ) pi * 180 / ; inline
-: rad>deg ( x -- y ) 180 * pi / ; inline