Merge pull request #392 from krists/dataset-circular-require-considered-harmful

HarlemSquirrel · web-flow · commit d6bb5c8d6946 · 2021-04-20T23:27:04.000-04:00
Fix circular require while loading lib/net/ldap/entry.rb and lib/net/ldap/dataset.rb
diff --git a/lib/net/ldap/dataset.rb b/lib/net/ldap/dataset.rb
@@ -1,5 +1,3 @@
-require_relative 'entry'
-
 # -*- ruby encoding: utf-8 -*-
 ##
 # An LDAP Dataset. Used primarily as an intermediate format for converting
diff --git a/lib/net/ldap/entry.rb b/lib/net/ldap/entry.rb
@@ -1,5 +1,3 @@
-require_relative 'dataset'
-
 # -*- ruby encoding: utf-8 -*-
 ##
 # Objects of this class represent individual entries in an LDAP directory.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'entry'`
`2`		`-`
`3`	`1`	`# -- ruby encoding: utf-8 --`
`4`	`2`	`##`
`5`	`3`	`# An LDAP Dataset. Used primarily as an intermediate format for converting`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-require_relative 'dataset'`
`2`		`-`
`3`	`1`	`# -- ruby encoding: utf-8 --`
`4`	`2`	`##`
`5`	`3`	`# Objects of this class represent individual entries in an LDAP directory.`