diff --git a/compiler/builddeps.nim b/compiler/builddeps.nim index 3070a9e5d9a68..e0ffea2c63dd8 100644 --- a/compiler/builddeps.nim +++ b/compiler/builddeps.nim @@ -45,5 +45,4 @@ proc addDependency*(conf: ConfigRef, name: string, info: TLineInfo) = localError(conf, info, "building '$#' failed: cmd: $#\noutput:\n$#" % [name, cmd, outp]) conf.addExternalFileToLink(objFile.AbsoluteFile) else: - # see https://github.com/timotheecour/Nim/issues/731 localError(conf, info, "expected: 'dragonbox', got: '$1'" % name) diff --git a/compiler/options.nim b/compiler/options.nim index eeab55b92e1fc..d8f8d8b17d61f 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -403,8 +403,7 @@ proc hasHint*(conf: ConfigRef, note: TNoteKind): bool = # could add here other special notes like hintSource # these notes apply globally. note in conf.mainPackageNotes - else: - note in conf.notes + else: note in conf.notes proc hasWarn*(conf: ConfigRef, note: TNoteKind): bool {.inline.} = optWarns in conf.options and note in conf.notes diff --git a/lib/vendor/drachennest/LICENSE.txt b/lib/vendor/drachennest/LICENSE.txt new file mode 100644 index 0000000000000..36b7cd93cdfba --- /dev/null +++ b/lib/vendor/drachennest/LICENSE.txt @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/lib/vendor/drachennest/readme.md b/lib/vendor/drachennest/readme.md index 8701f8692ad54..4a1baface2126 100644 --- a/lib/vendor/drachennest/readme.md +++ b/lib/vendor/drachennest/readme.md @@ -1,3 +1,3 @@ # files dragonbox.cc: adapted from https://github.com/abolz/Drachennest/blob/master/src/dragonbox.cc -LICENSE: copied from https://github.com/abolz/Drachennest/blob/master/LICENSE +LICENSE.txt: copied from https://github.com/abolz/Drachennest/blob/master/LICENSE