diff --git a/.dscanner.ini b/.dscanner.ini index fa434b0cc82..73b4851385e 100644 --- a/.dscanner.ini +++ b/.dscanner.ini @@ -295,9 +295,7 @@ object_const_check="-std.algorithm.searching,-std.array,-std.bitmanip,-std.check opequals_tohash_check="-std.complex,-std.container.array,-std.container.dlist,-std.container.rbtree,-std.container.slist,-std.datetime,-std.datetime.date,-std.experimental.checkedint,-std.internal.test.dummyrange,-std.json,-std.numeric,-std.random,-std.socket,-std.sumtype,-std.typecons,-std.uni" ; Check for properly documented public functions (Returns, Params) ; Note: DScanner doesn't understand documenting parameters of IFTI/eponymous templates. -properly_documented_public_functions="-etc.c.odbc.sql,\ --etc.c.odbc.sqlext,\ --etc.c.zlib,\ +properly_documented_public_functions="-etc.c.zlib,\ -std.algorithm.comparison,\ -std.algorithm.mutation,\ -std.algorithm.searching,\ @@ -397,9 +395,9 @@ redundant_attributes_check="-std.concurrency,-std.digest.md,-std.digest.ripemd,- ; Check variable, class, struct, interface, union, and function names against ; the Phobos style guide style_check="+disabled" -;style_check="-etc.c.curl,-etc.c.odbc.sqlext,-etc.c.odbc.sqltypes,-etc.c.odbc.sqlucode,-etc.c.sqlite3,-etc.c.zlib,-std.algorithm.comparison,-std.algorithm.internal,-std.algorithm.iteration,-std.algorithm.mutation,-std.algorithm.sorting,-std.array,-std.base64,-std.bitmanip,-std.c.linux.linux,-std.compiler,-std.container.array,-std.conv,-std.datetime.date,-std.datetime.interval,-std.datetime.systime,-std.digest,-std.digest.murmurhash,-std.digest.sha,-std.encoding,-std.exception,-std.experimental.allocator,-std.experimental.allocator.building_blocks.affix_allocator,-std.experimental.allocator.building_blocks.allocator_list,-std.experimental.allocator.building_blocks.bucketizer,-std.experimental.allocator.building_blocks.fallback_allocator,-std.experimental.allocator.building_blocks.free_list,-std.experimental.allocator.building_blocks.free_tree,-std.experimental.allocator.building_blocks.null_allocator,-std.experimental.allocator.building_blocks.region,-std.experimental.allocator.building_blocks.segregator,-std.experimental.allocator.common,-std.experimental.allocator.gc_allocator,-std.experimental.allocator.mallocator,-std.experimental.allocator.mmap_allocator,-std.experimental.checkedint,-std.format,-std.functional,-std.getopt,-std.internal.digest.sha_SSSE3,-std.internal.math.errorfunction,-std.internal.math.gammafunction,-std.internal.test.dummyrange,-std.internal.unicode_tables,-std.json,-std.math,-std.meta,-std.numeric,-std.parallelism,-std.path,-std.process,-std.random,-std.range,-std.range.primitives,-std.regex,-std.regex.internal.ir,-std.regex.internal.kickstart,-std.signals,-std.socket,-std.stdio,-std.string,-std.uni,-std.uri,-std.utf,-std.uuid,-std.variant,-std.zlib" +;style_check="-etc.c.curl,-etc.c.sqlite3,-etc.c.zlib,-std.algorithm.comparison,-std.algorithm.internal,-std.algorithm.iteration,-std.algorithm.mutation,-std.algorithm.sorting,-std.array,-std.base64,-std.bitmanip,-std.c.linux.linux,-std.compiler,-std.container.array,-std.conv,-std.datetime.date,-std.datetime.interval,-std.datetime.systime,-std.digest,-std.digest.murmurhash,-std.digest.sha,-std.encoding,-std.exception,-std.experimental.allocator,-std.experimental.allocator.building_blocks.affix_allocator,-std.experimental.allocator.building_blocks.allocator_list,-std.experimental.allocator.building_blocks.bucketizer,-std.experimental.allocator.building_blocks.fallback_allocator,-std.experimental.allocator.building_blocks.free_list,-std.experimental.allocator.building_blocks.free_tree,-std.experimental.allocator.building_blocks.null_allocator,-std.experimental.allocator.building_blocks.region,-std.experimental.allocator.building_blocks.segregator,-std.experimental.allocator.common,-std.experimental.allocator.gc_allocator,-std.experimental.allocator.mallocator,-std.experimental.allocator.mmap_allocator,-std.experimental.checkedint,-std.format,-std.functional,-std.getopt,-std.internal.digest.sha_SSSE3,-std.internal.math.errorfunction,-std.internal.math.gammafunction,-std.internal.test.dummyrange,-std.internal.unicode_tables,-std.json,-std.math,-std.meta,-std.numeric,-std.parallelism,-std.path,-std.process,-std.random,-std.range,-std.range.primitives,-std.regex,-std.regex.internal.ir,-std.regex.internal.kickstart,-std.signals,-std.socket,-std.stdio,-std.string,-std.uni,-std.uri,-std.utf,-std.uuid,-std.variant,-std.zlib" ; Checks for undocumented public declarations -undocumented_declaration_check="-etc.c.curl,-etc.c.odbc.sql,-etc.c.odbc.sqlext,-etc.c.odbc.sqltypes,-etc.c.odbc.sqlucode,-etc.c.sqlite3,-etc.c.zlib,-std.algorithm.sorting,-std.array,-std.ascii,-std.base64,-std.bitmanip,-std.c.linux.linux,-std.c.linux.socket,-std.c.osx.socket,-std.c.process,-std.compiler,-std.complex,-std.concurrency,-std.container,-std.container.array,-std.container.binaryheap,-std.container.dlist,-std.container.rbtree,-std.container.slist,-std.conv,-std.csv,-std.datetime,-std.datetime.date,-std.digest,-std.digest.hmac,-std.digest.md,-std.digest.murmurhash,-std.digest.ripemd,-std.digest.sha,-std.encoding,-std.exception,-std.experimental.allocator,-std.experimental.allocator.building_blocks.affix_allocator,-std.experimental.allocator.building_blocks.allocator_list,-std.experimental.allocator.building_blocks.bitmapped_block,-std.experimental.allocator.building_blocks.fallback_allocator,-std.experimental.allocator.building_blocks.free_list,-std.experimental.allocator.building_blocks.free_tree,-std.experimental.allocator.building_blocks.kernighan_ritchie,-std.experimental.allocator.building_blocks.quantizer,-std.experimental.allocator.building_blocks.region,-std.experimental.allocator.building_blocks.segregator,-std.experimental.allocator.building_blocks.stats_collector,-std.experimental.allocator.gc_allocator,-std.experimental.allocator.mallocator,-std.experimental.checkedint,-std.logger.core,-std.file,-std.format,-std.functional,-std.internal.digest.sha_SSSE3,-std.internal.math.biguintcore,-std.internal.math.biguintnoasm,-std.internal.math.biguintx86,-std.internal.math.errorfunction,-std.internal.math.gammafunction,-std.internal.test.dummyrange,-std.internal.test.uda,-std.internal.windows.advapi32,-std.json,-std.math,-std.mmfile,-std.numeric,-std.outbuffer,-std.parallelism,-std.path,-std.process,-std.regex,-std.regex.internal.parser,-std.signals,-std.socket,-std.stdio,-std.string,-std.system,-std.traits,-std.uni,-std.utf,-std.variant,-std.windows.charset,-std.windows.registry,-std.windows.syserror,-std.zip,-std.zlib,-std.int128" +undocumented_declaration_check="-etc.c.curl,-etc.c.sqlite3,-etc.c.zlib,-std.algorithm.sorting,-std.array,-std.ascii,-std.base64,-std.bitmanip,-std.c.linux.linux,-std.c.linux.socket,-std.c.osx.socket,-std.c.process,-std.compiler,-std.complex,-std.concurrency,-std.container,-std.container.array,-std.container.binaryheap,-std.container.dlist,-std.container.rbtree,-std.container.slist,-std.conv,-std.csv,-std.datetime,-std.datetime.date,-std.digest,-std.digest.hmac,-std.digest.md,-std.digest.murmurhash,-std.digest.ripemd,-std.digest.sha,-std.encoding,-std.exception,-std.experimental.allocator,-std.experimental.allocator.building_blocks.affix_allocator,-std.experimental.allocator.building_blocks.allocator_list,-std.experimental.allocator.building_blocks.bitmapped_block,-std.experimental.allocator.building_blocks.fallback_allocator,-std.experimental.allocator.building_blocks.free_list,-std.experimental.allocator.building_blocks.free_tree,-std.experimental.allocator.building_blocks.kernighan_ritchie,-std.experimental.allocator.building_blocks.quantizer,-std.experimental.allocator.building_blocks.region,-std.experimental.allocator.building_blocks.segregator,-std.experimental.allocator.building_blocks.stats_collector,-std.experimental.allocator.gc_allocator,-std.experimental.allocator.mallocator,-std.experimental.checkedint,-std.logger.core,-std.file,-std.format,-std.functional,-std.internal.digest.sha_SSSE3,-std.internal.math.biguintcore,-std.internal.math.biguintnoasm,-std.internal.math.biguintx86,-std.internal.math.errorfunction,-std.internal.math.gammafunction,-std.internal.test.dummyrange,-std.internal.test.uda,-std.internal.windows.advapi32,-std.json,-std.math,-std.mmfile,-std.numeric,-std.outbuffer,-std.parallelism,-std.path,-std.process,-std.regex,-std.regex.internal.parser,-std.signals,-std.socket,-std.stdio,-std.string,-std.system,-std.traits,-std.uni,-std.utf,-std.variant,-std.windows.charset,-std.windows.registry,-std.windows.syserror,-std.zip,-std.zlib,-std.int128" ; Checks for unused labels unused_label_check="-std.conv,-std.internal.math.biguintx86,-std.regex.internal.thompson,-std.signals,-std.uni" ; Checks for unused function parameters @@ -513,4 +511,4 @@ trust_too_much="-std.regex,-std.stdio,-std.uni,-std.internal.cstring" ; Temporarily disable until https://github.com/dlang-community/D-Scanner/issues/593 is fixed if_else_same_check="-std.typecons" ; Disable checks for generated unicode tables -long_line_check="-std.internal.unicode_decomp,-std.internal.unicode_comp,-std.internal.unicode_grapheme,-std.internal.unicode_norm,-std.internal.unicode_tables" \ No newline at end of file +long_line_check="-std.internal.unicode_decomp,-std.internal.unicode_comp,-std.internal.unicode_grapheme,-std.internal.unicode_norm,-std.internal.unicode_tables" diff --git a/etc/c/odbc/sql.d b/etc/c/odbc/sql.d deleted file mode 100644 index 750377e8b46..00000000000 --- a/etc/c/odbc/sql.d +++ /dev/null @@ -1,16 +0,0 @@ -// @@@DEPRECATED_2.106@@@ - -/** -$(RED Warning: - This module is deprecated. It will be removed in 2.106. - Use `core.sys.windows.sql` instead.) - -Declarations for interfacing with the ODBC library. - -See_Also: $(LINK2 https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/odbc-api-reference, - ODBC API Reference on MSN Online) - */ -deprecated("Import core.sys.windows.sql instead") -module etc.c.odbc.sql; - -public import core.sys.windows.sql; diff --git a/etc/c/odbc/sqlext.d b/etc/c/odbc/sqlext.d deleted file mode 100644 index 39a64aa00e6..00000000000 --- a/etc/c/odbc/sqlext.d +++ /dev/null @@ -1,16 +0,0 @@ -// @@@DEPRECATED_2.106@@@ - -/** -$(RED Warning: - This module is deprecated. It will be removed in 2.106. - Use `core.sys.windows.sqlext` instead.) - -Declarations for interfacing with the ODBC library. - -See_Also: $(LINK2 https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/odbc-api-reference, - ODBC API Reference on MSN Online) - */ -deprecated("Import core.sys.windows.sqlext instead") -module etc.c.odbc.sqlext; - -public import core.sys.windows.sqlext; diff --git a/etc/c/odbc/sqltypes.d b/etc/c/odbc/sqltypes.d deleted file mode 100644 index 65c0ebf100b..00000000000 --- a/etc/c/odbc/sqltypes.d +++ /dev/null @@ -1,16 +0,0 @@ -// @@@DEPRECATED_2.106@@@ - -/** -$(RED Warning: - This module is deprecated. It will be removed in 2.106. - Use `core.sys.windows.sqltypes` instead.) - -Declarations for interfacing with the ODBC library. - -See_Also: $(LINK2 https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/odbc-api-reference, - ODBC API Reference on MSN Online) - */ -deprecated("Import core.sys.windows.sqltypes instead") -module etc.c.odbc.sqltypes; - -public import core.sys.windows.sqltypes; diff --git a/etc/c/odbc/sqlucode.d b/etc/c/odbc/sqlucode.d deleted file mode 100644 index 370a727f2dd..00000000000 --- a/etc/c/odbc/sqlucode.d +++ /dev/null @@ -1,16 +0,0 @@ -// @@@DEPRECATED_2.106@@@ - -/** -$(RED Warning: - This module is deprecated. It will be removed in 2.106. - Use `core.sys.windows.sqlucode` instead.) - -Declarations for interfacing with the ODBC library. - -See_Also: $(LINK2 https://docs.microsoft.com/en-us/sql/odbc/reference/syntax/odbc-api-reference, - ODBC API Reference on MSN Online) - */ -deprecated("Import core.sys.windows.sqlucode instead") -module etc.c.odbc.sqlucode; - -public import core.sys.windows.sqlucode; diff --git a/index.dd b/index.dd index 48122259670..c9cf4fdcb26 100644 --- a/index.dd +++ b/index.dd @@ -135,19 +135,6 @@ $(BOOKTABLE , $(TDNW $(MREF etc,c,curl)) $(TD Interface to libcurl C library.) ) - $(TR - $(TDNW $(MREF etc,c,odbc,sql)) - $(TD Interface to ODBC C library.) - ) - $(TR - $(TDNW $(MREF etc,c,odbc,sqlext)) - ) - $(TR - $(TDNW $(MREF etc,c,odbc,sqltypes)) - ) - $(TR - $(TDNW $(MREF etc,c,odbc,sqlucode)) - ) $(TR $(TDNW $(MREF etc,c,sqlite3)) $(TD Interface to SQLite C library.) diff --git a/posix.mak b/posix.mak index 2f05370dbfa..d6247676117 100644 --- a/posix.mak +++ b/posix.mak @@ -258,8 +258,7 @@ STD_MODULES=$(call P2MODULES,$(STD_PACKAGES)) NO_AUTODECODE_MODULES= std/utf # Other D modules that aren't under std/ -EXTRA_MODULES_COMMON := $(addprefix etc/c/,curl odbc/sql odbc/sqlext \ - odbc/sqltypes odbc/sqlucode sqlite3 zlib) +EXTRA_MODULES_COMMON := $(addprefix etc/c/,curl sqlite3 zlib) EXTRA_DOCUMENTABLES := $(EXTRA_MODULES_COMMON) diff --git a/win32.mak b/win32.mak index b29fad7589e..55f2533d7d1 100644 --- a/win32.mak +++ b/win32.mak @@ -330,11 +330,7 @@ SRC_ETC= SRC_ETC_C= \ etc\c\zlib.d \ etc\c\curl.d \ - etc\c\sqlite3.d \ - etc\c\odbc\sql.d \ - etc\c\odbc\sqlext.d \ - etc\c\odbc\sqltypes.d \ - etc\c\odbc\sqlucode.d + etc\c\sqlite3.d SRC_TO_COMPILE= \ $(SRC_STD) \ diff --git a/win64.mak b/win64.mak index f094ab12170..89cf06c171e 100644 --- a/win64.mak +++ b/win64.mak @@ -338,11 +338,7 @@ SRC_ETC= SRC_ETC_C= \ etc\c\zlib.d \ etc\c\curl.d \ - etc\c\sqlite3.d \ - etc\c\odbc\sql.d \ - etc\c\odbc\sqlext.d \ - etc\c\odbc\sqltypes.d \ - etc\c\odbc\sqlucode.d + etc\c\sqlite3.d SRC_TO_COMPILE= \ $(SRC_STD) \