Skip to content

Commit b831b5f

Browse files
authored
Remove deprecated text::format export. (#2413)
Clean up the code from this confusing hack which also disabled a clippy lint.
1 parent 55e2dd8 commit b831b5f

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ You can find its changes [documented below](#083---2023-02-28).
2121

2222
### Removed
2323

24+
- `text::format` module which was previously deprecated. ([#2413] by [@xStrom])
25+
2426
### Fixed
2527

2628
- `syn` feature `extra-traits` is now always enabled. ([#2375] by [@AtomicGamer9523])
@@ -1244,6 +1246,7 @@ Last release without a changelog :(
12441246
[#2380]: https://github.com/linebender/druid/pull/2380
12451247
[#2402]: https://github.com/linebender/druid/pull/2402
12461248
[#2409]: https://github.com/linebender/druid/pull/2409
1249+
[#2413]: https://github.com/linebender/druid/pull/2413
12471250

12481251
[Unreleased]: https://github.com/linebender/druid/compare/v0.8.3...master
12491252
[0.8.3]: https://github.com/linebender/druid/compare/v0.8.2...v0.8.3

druid/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136
)]
137137
#![warn(missing_docs)]
138138
#![allow(clippy::new_ret_no_self, clippy::needless_doctest_main)]
139-
#![allow(clippy::duplicate_mod)] // TODO: Remove this after the text/mod.rs format_priv hack has been removed (0.8.0+)
140139
#![cfg_attr(docsrs, feature(doc_cfg))]
141140
#![doc(
142141
html_logo_url = "https://raw.githubusercontent.com/linebender/druid/screenshots/images/doc_logo.png"

druid/src/text/mod.rs

+2-9
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ mod attribute;
77
mod backspace;
88
mod editable_text;
99
mod font_descriptor;
10-
11-
#[deprecated(since = "0.8.0", note = "use types from druid::text module instead")]
12-
#[doc(hidden)]
13-
pub mod format;
14-
// a hack to let us deprecate the format module; we can remove this when we make
15-
// format private
16-
#[path = "format.rs"]
17-
mod format_priv;
10+
mod format;
1811
mod input_component;
1912
mod input_methods;
2013
mod layout;
@@ -32,7 +25,7 @@ pub use self::attribute::{Attribute, AttributeSpans, Link};
3225
pub use self::backspace::offset_for_delete_backwards;
3326
pub use self::editable_text::{EditableText, EditableTextCursor, StringCursor};
3427
pub use self::font_descriptor::FontDescriptor;
35-
pub use self::format_priv::{Formatter, ParseFormatter, Validation, ValidationError};
28+
pub use self::format::{Formatter, ParseFormatter, Validation, ValidationError};
3629
pub use self::layout::{LayoutMetrics, TextLayout};
3730
pub use self::movement::movement;
3831
pub use input_component::{EditSession, TextComponent};

0 commit comments

Comments
 (0)