Skip to content

Commit 47f5f9c

Browse files
committed
Revert "Merge branch 'master' into fix-scan-dirs"
This reverts commit 54bfc9e, reversing changes made to c9a91cc.
1 parent f3bea29 commit 47f5f9c

File tree

3 files changed

+11
-20
lines changed

3 files changed

+11
-20
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ jobs:
1414
run: |
1515
dotnet tool install --global Clojure.Main --version 1.12.0-alpha10
1616
dotnet tool install --global Clojure.Cljr --version 0.1.0-alpha5
17-
1817
- name: Run cljr tests
19-
run: cljr -X:test
20-
18+
run: cljr -X:test

src/main/clojure/clojure/tools/namespace/dir.clj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@
2929
(mapcat #(find/find-sources-in-dir % platform))
3030
)) ;;; ditto: (map #(.getCanonicalFile ^File %))
3131

32-
(defn- modified-since-tracked? [tracker file]
33-
(if-let [time (::time tracker)]
34-
(DateTime/op_LessThan time (.LastWriteTimeUtc ^FileSystemInfo file))
35-
true))
32+
(defn- milliseconds-since-epoch [^DateTime time]
33+
(long
34+
(/ (- (.-Ticks time)
35+
(.-Ticks DateTime/UnixEpoch))
36+
TimeSpan/TicksPerMillisecond)))
3637

3738
(defn- modified-files [tracker files]
38-
(filter (partial modified-since-tracked? tracker) files)) ;;; (.lastModified ^File %)
39+
(filter #(< (::time tracker 0) (milliseconds-since-epoch (.-LastWriteTimeUtc ^FileSystemInfo %))) files)) ;;; #(< (::time tracker 0) (.lastModified ^File %))
3940

4041
(defn- deleted-files [tracker files]
4142
(set (remove #(file/some-file files %) (::files tracker #{})))) ;;; (set/difference (::files tracker #{}) (set files))
@@ -137,3 +138,6 @@
137138
(instance? DirectoryInfo x) x
138139
(string? x) (DirectoryInfo. ^String x)
139140
:default (DirectoryInfo. (str x))))
141+
142+
143+

src/test/clojure/clojure/tools/namespace/dir_test.clj

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,6 @@
44
[clojure.tools.namespace.dir :as dir])
55
#_(:import
66
(java.io File)))
7-
8-
(defmacro is-not-thrown? [& body]
9-
`(try
10-
~@body
11-
(is true "No exception thrown")
12-
(catch Exception e#
13-
(is false (str "Expected no exception, but got: " (.GetType e#) ": " (.-Message e#))))))
14-
15-
(deftest scan-dirs-does-not-throw
16-
(is-not-thrown? (dir/scan-dirs {})))
17-
187
;;; I don't know what the equivalent test would be for .Net.
198
#_(defn- make-symbolic-link
209
"Reflectively calls java.nio.file.Files/createSymbolicLink on two
@@ -46,4 +35,4 @@
4635
link (File. other-dir "link")]
4736
(make-symbolic-link link dir)
4837
(is (= (::dir/files (dir/scan-dirs {} [dir]))
49-
(::dir/files (dir/scan-dirs {} [link])))))))
38+
(::dir/files (dir/scan-dirs {} [link])))))))

0 commit comments

Comments
 (0)