Skip to content
This repository has been archived by the owner on Jun 8, 2021. It is now read-only.

Commit

Permalink
Update to 1.36 as minimum pango version
Browse files Browse the repository at this point in the history
  • Loading branch information
sdroege committed Feb 6, 2019
1 parent 8a9bb31 commit f479f04
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ appveyor = { repository = "GuillaumeGomez/pango", service = "github" }
travis-ci = { repository = "gtk-rs/pango" }

[features]
v1_31 = ["pango-sys/v1_31"]
v1_32 = ["v1_31", "pango-sys/v1_32"]
v1_32_4 = ["v1_32", "pango-sys/v1_32_4"]
v1_34 = ["v1_32_4", "pango-sys/v1_34"]
v1_36_7 = ["v1_34", "pango-sys/v1_36_7"]
v1_36_7 = ["pango-sys/v1_36_7"]
v1_38 = ["v1_36_7", "pango-sys/v1_38"]
v1_40 = ["v1_38"]
v1_42 = ["v1_40", "pango-sys/v1_42"]
Expand Down
3 changes: 2 additions & 1 deletion Gir.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ version = "1.0"
target_path = "."
work_mode = "normal"
generate_safety_asserts = false
min_cfg_version = "1.30"
min_cfg_version = "1.36"
single_version_file = true
deprecate_by_min_version = true

generate = [
# "Pango.AttrColor",
Expand Down
3 changes: 0 additions & 3 deletions src/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ use std::ptr;

use glib::translate::*;

#[cfg(any(feature = "v1_32", feature = "dox"))]
use Analysis;
#[cfg(any(feature = "v1_32", feature = "dox"))]
use GlyphString;

pub fn reorder_items(logical_items: &[&Item]) -> Vec<Item> {
Expand All @@ -27,7 +25,6 @@ pub fn reorder_items(logical_items: &[&Item]) -> Vec<Item> {
}
}

#[cfg(any(feature = "v1_32", feature = "dox"))]
pub fn shape_full<'a, P: Into<Option<&'a str>>>(item_text: &str, paragraph_text: P, analysis: &Analysis, glyphs: &mut GlyphString) {
let paragraph_text = paragraph_text.into();
let paragraph_length = match paragraph_text {
Expand Down

0 comments on commit f479f04

Please sign in to comment.